<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f506ffd0 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
Generated 2022-10-06T17:07:21+03:00
======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= =======
Generated 2022-10-06T17:07:21+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 95.71% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 379a979 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 366b257 (Fix) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 2.92 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2.92 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 3.03 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) 92 files in total. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and <<<<<<< HEAD 3 lines missed. ( <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 400 relevant lines, 397 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD <<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 400 relevant lines, 397 lines covered and >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= ======= <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 90.68% >>>>>>> 824bb2b (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= =======
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 4976a174 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= =======
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= 41 files in total. <<<<<<< HEAD ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= 41 files in total. >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) =======
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 92 files in total. >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 90.68% ======= 99.2% ======= 34 files in total. ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
377 relevant lines, 374 lines covered and 3 lines missed. ( >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 41 files in total.
338 relevant lines, 335 lines covered and 3 lines missed. ( 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> 9bfbd88 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. <<<<<<< HEAD ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.2% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 23c4703e (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 92 files in total.
1141 relevant lines, 1093 lines covered and 48 lines missed. ( 95.79% >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= ======= 41 files in total. <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> e59c273d (Manifest_cache true) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> d68e8240 (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 446d79a (Fix) >>>>>>> 366b257 (Fix) <<<<<<< HEAD >>>>>>> d68e8240 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 5a2009f1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bae2b7de (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0561be1d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5b7749a (Fix) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> 393eff3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.864.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.401app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/admin/authors.rbapp/controllers/application_controller.rb100.00 % 36 22 22 0 1.95app/controllers/application_controller.rb100.00 % 2 1 1app/controllers/books_controller.rb 93.33 % 30 15 1414 013.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.9513.361 14.13
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.9012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 %57 41 41 0 2.4977 51 51 0 4.20app/admin/books.rb 100.00 % 77 5111 40 0.2251 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 44.715.86
app/controllers/application_controller.rbapp/controllers/application_controller.rb 100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rbapp/controllers/application_controller.rbapp/controllers/application_controller.rb100.00 % 36 2222 0 1.95app/controllers/application_controller.rbapp/controllers/application_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.8640.91 % 36 22 9 13 0.41100.00 % 36 22 22 0 1.95app/controllers/application_controller.rbapp/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 0 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50app/controllers/application_controller.rb 100.00 %1.50
app/decorators/book_decorator.rb 100.00 % 18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 22 1 1 0 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rbapp/controllers/application_controller.rb100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.940 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.5013.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.88
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 432 21 1app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.869 13 0.4122 0 1.950 1.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb100.00 % 7 44 0 1.50
app/decorators/book_decorator.rb 100.00 %18 10 10 0 12.90
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 20 1.00
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2 0 1.00
app/admin/dashboard.rb42.86 % 14 7 3 44.71app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.3613.8613.36
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 18 109 1 0.9010 0 12.90100.00 % 2 1 1app/controllers/application_controller.rb 100.00 % 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 01.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.9010 0 12.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.00
app/decorators/paginating_decorator.rb 100.00 % 3 2 21 11 10 1.0013.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.500.435.86
app/controllers/books_controller.rb93.75 % 31 1693.33 % 3015 113.9414.13app/controllers/books_controller.rb100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.931.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.5075.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %23 1212 024.500.90
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rb 100.00 % 2 1 10 1.001.86
app/decorators/category_decorator.rb 100.00 % 5 2 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25app/controllers/books_controller.rb93.75 % 31 16 15 1 13.9493.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/reviews_controller.rb 100.00 %19 10 10 0 1.3017 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501 0.75
app/decorators/book_decorator.rb100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 109 1 0.900 47.20
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.250 47.60
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 10 1.00
app/decorators/author_decorator.rb 100.00 % 7 43 1 0.754 0 1.50
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1app/controllers/application_controller.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 % 5 2 21 1100.00 % 2 1 10 1.00
app/controllers/books_controller.rb93.33 % 30 15 14 1 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb100.00 % 24 12 12 013.5013.8613.50app/controllers/books_controller.rb 93.75 % 31 16 15 113.94app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rb14.94
app/controllers/coupons_controller.rb100.00 % 14 8 8 013.5013.8613.502.8813.50
app/controllers/home_controller.rb 100.00 % 12 7 7 06.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 %17 9 9 0 1.3319 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb100.00 % 7 4 4 0 1.501.2575.00 % 7 4 3 1 0.75100.00 % 7 4 4 0 1.501.251.251.25
app/decorators/book_decorator.rb100.00 %66.67 %100.00 %100.00 %100.00 %100.00 %23 1266.67 % 23 1223 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.58
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7512 025.6712 0 24.5012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75100.00 % 23 12 12 0 24.50
app/decorators/paginating_decorator.rb 100.00 % 355552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 20 1.00
app/controllers/books_controller.rb93.33 % 30 15 14100.00 % 28 14100.00 % 28 14100.00 % 28 14100.00 % 28 1414 0 13.361 14.13app/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/controllers/books_controller.rbapp/decorators/review_decorator.rb100.00 %7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.86app/controllers/books_controller.rb1.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0app/decorators/review_decorator.rb 100.00 % 7 4 4 01.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb100.00 %7 4 4 0 5.00100.00 %5 3 3 0 4.6775.00 % 7 4 3 1 0.75100.00 %7 4 4 04.005.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/models/address.rb100.00 % 2412 12 0 13.5013.86app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 0 1.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 %100.00 %5 3 3 0 4.677 4 4 0 4.0075.00 % 7 4 3 1 0.75100.00 %100.00 %7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb 100.00 % 247 7 0100.00 %app/controllers/books_controller.rb 100.00 %2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rb 100.00 % 6app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 3app/helpers/application_helper.rb 100.00 % 32 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/models/admin_user.rb100.00 % 6 2 2100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 20 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 46 4 47 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 57 5 56 4 46 4 47 5 57 5 57 5 57 5 50 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 16 4 40 1.00
app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 917 9 917 9 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 40 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 139 9app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 100 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 216 7 70 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rbapp/models/review.rbapp/models/review.rbapp/models/review.rb100.00 % 16 7 7100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb100.00 % 16app/models/user.rb 100.00 %app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 1582 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 1677 0 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 82 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 7app/models/review.rb100.00 % 167 7app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 40 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 167 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8app/queries/book_query.rb 87.50 % 15 87 70 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7 1app/models/shipping.rb 100.00 % 2 117.507.50app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00app/models/user.rb 100.00 % 8 2 2 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 1 7.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/coupon_service.rb 100.00 % 19 8 8 0 2.25
config/application.rb 100.00 % 22 6 6 0 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 140 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 3 3 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rbconfig/initializers/money.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 33 32 23 33 30 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 23 33 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %7 4 45 3 317 9 917 9 95 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 95 3 37 4 45 3 35 3 37 4 417 9 95 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 170 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 01.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rb100.00 % 6 4 4 08.007.007.008.001.008.008.008.007.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.508 2 2.50spec/factories/authors.rbspec/factories/authors.rb100.00 % 6 4 4 01.007 3 0.708 2 2.507 3 0.708 2 2.507.001.008.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.508 2 2.508 2 2.50spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.501.007 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.001.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.001.001.00
spec/factories/books.rb 80.95 % 35 2117 4 45.52spec/factories/books.rbspec/factories/billings.rb100.00 % 10 8 8 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3845.5217 446.3817 446.38spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.621.0068.0069.5615 6 0.71
spec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books.rb 80.95 % 35 21 17 4 45.5217 4 46.3845.5217 4 46.3817 446.3817 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.0068.002.5669.562.5668.0046.3868.002.5668.002.5668.0068.002.5669.5668.002.5669.5615 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.562.5668.002.562.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.00
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_categories.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.674.673.333.333.331.004.674.674.674.673.333.333.331.004.671.004.673.333.333.333.333.334.673.334.67
spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 27 5 5spec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 27 5 50 1.00spec/factories/users.rbspec/factories/reviews.rb100.00 % 7 5 5spec/factories/users.rb 100.00 % 4 2 20 1.00spec/factories/users.rb 100.00 % 4 2 20 1.00
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.38
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.5015 9 9 0 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.381.001.001.00
spec/feature/book_spec.rb1.00
spec/models/user_spec.rb100.00 % 202 105 105 02.371.001.531.53
spec/feature/book_spec.rb 100.00 % 202 105 105 0 2.37
spec/feature/home_spec.rb 100.00 % 39 20 20 0 1.05
spec/models/author_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.380 1.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.40
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.381.381.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3spec/support/configs/capybara.rb100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 190 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.001.001.001.001.00
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.00100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919191919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %36.84 % 29 19 7 12 0.37100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00
spec/support/configs/shoulda_matcher.rb 100.00 %88889999989999999899998898999999899985 5 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. ======= 51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) 41 relevant lines. 41 lines covered and ======= 51 relevant lines. 51 lines covered and >>>>>>> b28889f (Fix) 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= 11 lines covered and 40 lines missed. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= 41 relevant lines. 41 lines covered and 0 lines missed. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> c7a726c5 (Rebased) ======= author_ids: [], category_ids: [], images: [] >>>>>>> bc6bc8d2 (Rebased) ======= author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  11. 4 =======
  12. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  13. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  14. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  15. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  16. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) selectable_column
  17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  18. 4 =======
  19. 6 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  21. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) column :categories, &:categories_names
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  23. 6 >>>>>>> b28889f (Fix) =======
  24. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  25. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  26. 4 >>>>>>> c7a726c5 (Rebased) =======
  27. 6 >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  28. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :title
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  30. 4 =======
  31. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  32. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
  33. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :year_of_publication
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  35. 4 =======
  36. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  37. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
  38. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :materials
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  40. 4 =======
  41. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  42. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
  43. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :dimensions
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  45. 4 column :price_cents, &:price
  46. 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0f8241bb (Featire specs) =======
  47. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :quantity
  48. 4 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) =======
  49. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  50. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) column :authors, &:authors_names
  51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  52. 4 =======
  53. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  54. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  55. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  56. 4 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  57. 4 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs) column :description
  58. <<<<<<< HEAD <<<<<<< HEAD
  59. 6 =======
  60. >>>>>>> bc6bc8d2 (Rebased) =======
  61. 6 >>>>>>> 8288136d (Fix) column :price, &:price
  62. <<<<<<< HEAD <<<<<<< HEAD
  63. 6 =======
  64. >>>>>>> bc6bc8d2 (Rebased) =======
  65. 6 >>>>>>> 8288136d (Fix) column :quantity
  66. <<<<<<< HEAD <<<<<<< HEAD
  67. 6 =======
  68. >>>>>>> bc6bc8d2 (Rebased) =======
  69. 6 >>>>>>> 8288136d (Fix) actions <<<<<<< HEAD <<<<<<< HEAD ======= column :categories, &:categories_names >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= column :categories, &:categories_names >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) =======
  71. 4 actions
  72. <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  74. =======
  75. >>>>>>> c7a726c5 (Rebased) =======
  76. >>>>>>> bc6bc8d2 (Rebased) =======
  77. =======
  78. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  80. =======
  81. >>>>>>> c7a726c5 (Rebased) =======
  82. >>>>>>> bc6bc8d2 (Rebased) =======
  83. =======
  84. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 show do
  85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  86. 3 =======
  87. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  88. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  89. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  90. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  91. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) attributes_table do
  92. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  93. 3 =======
  94. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  95. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  96. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  97. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  98. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :authors, &:authors_names
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  100. 3 =======
  101. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  102. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  103. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  104. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  105. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :categories, &:categories_names
  106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  107. 3 =======
  108. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  109. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  110. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  111. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  112. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :year_of_publication
  113. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  114. 3 =======
  115. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  116. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  117. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  118. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  119. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :description
  120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  121. 3 =======
  122. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  123. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  124. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  125. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  126. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :materials
  127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  128. 3 =======
  129. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  130. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  131. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  132. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  133. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :dimensions
  134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  135. 3 =======
  136. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  137. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  138. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  139. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  140. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :price, &:price
  141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  142. 3 =======
  143. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  144. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  145. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  146. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  147. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :created_at
  148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  149. 3 =======
  150. 5 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  151. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  152. 5 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  153. 3 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  154. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) row :updated_at
  155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  156. =======
  157. >>>>>>> c7a726c5 (Rebased) =======
  158. >>>>>>> bc6bc8d2 (Rebased) =======
  159. =======
  160. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  161. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs)
  162. =======
  163. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) panel :images do
  164. 5 table do
  165. 5 book.images.each do |image|
  166. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  167. end
  168. end
  169. end
  170. >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  171. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
  172. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  173. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) =======
  174. >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= =======
  175. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  176. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs)
  177. ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  178. >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) panel :images do
  179. <<<<<<< HEAD <<<<<<< HEAD
  180. 5 =======
  181. >>>>>>> bc6bc8d2 (Rebased) =======
  182. 5 >>>>>>> 8288136d (Fix) table do
  183. <<<<<<< HEAD <<<<<<< HEAD
  184. 5 =======
  185. >>>>>>> bc6bc8d2 (Rebased) =======
  186. 5 >>>>>>> 8288136d (Fix) book.images.each do |image|
  187. <<<<<<< HEAD <<<<<<< HEAD
  188. 2 =======
  189. >>>>>>> bc6bc8d2 (Rebased) =======
  190. 2 >>>>>>> 8288136d (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  191. end
  192. end
  193. end
  194. end
  195. <<<<<<< HEAD <<<<<<< HEAD =======
  196. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= =======
  197. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 form do |f|
  198. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  199. 2 =======
  200. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  201. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  202. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  203. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  204. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.inputs do
  205. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  206. 2 =======
  207. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  208. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  209. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  210. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  211. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :title
  212. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  213. 2 =======
  214. 6 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  215. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  216. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.input :description
  217. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  218. 6 >>>>>>> b28889f (Fix) =======
  219. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  220. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  221. 2 >>>>>>> c7a726c5 (Rebased) =======
  222. 6 >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  223. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :year_of_publication
  224. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  225. 2 =======
  226. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  227. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  228. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  229. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  230. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :price_cents
  231. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  232. 2 =======
  233. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  234. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  235. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  236. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  237. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :materials
  238. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  239. 2 =======
  240. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  241. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  242. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  243. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  244. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :dimensions
  245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  246. 2 =======
  247. 6 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  248. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  249. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  250. 2 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  251. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) f.input :quantity
  252. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) =======
  253. 2 f.input :description, as: :text
  254. 2 f.input :categories, as: :select, collection: Category.all
  255. 2 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  256. end
  257. 2 f.actions
  258. <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
  260. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  261. 6 =======
  262. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  263. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  264. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.input :categories, as: :select, collection: Category.all
  265. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  266. 6 =======
  267. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  268. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  269. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  270. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  271. 6 =======
  272. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  273. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  274. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.input :images, as: :file, input_html: { multiple: true }
  275. end
  276. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  277. 6 =======
  278. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  279. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  280. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) panel :images do
  281. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  282. 6 =======
  283. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  284. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  285. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.object.images.each do |image|
  286. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  287. 1 =======
  288. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  289. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  290. 1 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  291. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  292. 1 =======
  293. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  294. 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  295. 1 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  296. data: { confirm: "Delete #{image.filename}?" })
  297. end
  298. end
  299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix)
  300. 6 =======
  301. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  302. 6 >>>>>>> 872e675 (Fix) <<<<<<< HEAD =======
  303. 6 >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) f.actions
  304. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  305. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  306. ======= ======= >>>>>>> 49e8a6c (Rebased)
  307. 1 member_action :delete_image, method: :delete do
  308. <<<<<<< HEAD <<<<<<< HEAD
  309. 1 =======
  310. >>>>>>> 49e8a6c (Rebased) =======
  311. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  312. <<<<<<< HEAD <<<<<<< HEAD
  313. 1 =======
  314. >>>>>>> 49e8a6c (Rebased) =======
  315. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  316. ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) end
  317. <<<<<<< HEAD
  318. <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) =======
  319. >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0f8241bb (Featire specs)
  320. ======= ======= >>>>>>> 49e8a6c (Rebased)
  321. 1 member_action :delete_image, method: :delete do
  322. <<<<<<< HEAD <<<<<<< HEAD
  323. 1 =======
  324. >>>>>>> 49e8a6c (Rebased) =======
  325. 1 >>>>>>> 872e675 (Fix) ActiveStorage::Attachment.find(params[:id]).destroy
  326. <<<<<<< HEAD <<<<<<< HEAD
  327. 1 =======
  328. >>>>>>> 49e8a6c (Rebased) =======
  329. 1 >>>>>>> 872e675 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  330. end
  331. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= =======
  332. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
  4. 31 =======
  5. 39 >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) =======
  6. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) =======
  7. 39 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  8. 31 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= =======
  9. 31 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  10. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  11. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  12. span class: 'blank_slate' do
  13. span I18n.t('active_admin.dashboard_welcome.welcome')
  14. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  15. end
  16. end
  17. end
  18. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 51 lines covered and 0 lines missed. ======= 11 lines covered and 40 lines missed. >>>>>>> 11792758 (Rebased) ======= 51 lines covered and 0 lines missed. >>>>>>> 31d15e66 (Fix)
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. 6 =======
  12. >>>>>>> 11792758 (Rebased) =======
  13. 6 >>>>>>> 31d15e66 (Fix) selectable_column
  14. <<<<<<< HEAD <<<<<<< HEAD
  15. 6 =======
  16. >>>>>>> 11792758 (Rebased) =======
  17. 6 >>>>>>> 31d15e66 (Fix) column :categories, &:categories_names
  18. <<<<<<< HEAD <<<<<<< HEAD
  19. 6 =======
  20. >>>>>>> 11792758 (Rebased) =======
  21. 6 >>>>>>> 31d15e66 (Fix) column :title
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. 6 =======
  24. >>>>>>> 11792758 (Rebased) =======
  25. 6 >>>>>>> 31d15e66 (Fix) column :authors, &:authors_names
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. 6 =======
  28. >>>>>>> 11792758 (Rebased) =======
  29. 6 >>>>>>> 31d15e66 (Fix) column :description
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. 6 =======
  32. >>>>>>> 11792758 (Rebased) =======
  33. 6 >>>>>>> 31d15e66 (Fix) column :price, &:price
  34. <<<<<<< HEAD <<<<<<< HEAD
  35. 6 =======
  36. >>>>>>> 11792758 (Rebased) =======
  37. 6 >>>>>>> 31d15e66 (Fix) column :quantity
  38. <<<<<<< HEAD <<<<<<< HEAD
  39. 6 =======
  40. >>>>>>> 11792758 (Rebased) =======
  41. 6 >>>>>>> 31d15e66 (Fix) actions
  42. end
  43. 1 show do
  44. <<<<<<< HEAD <<<<<<< HEAD
  45. 5 =======
  46. >>>>>>> 11792758 (Rebased) =======
  47. 5 >>>>>>> 31d15e66 (Fix) attributes_table do
  48. <<<<<<< HEAD <<<<<<< HEAD
  49. 5 =======
  50. >>>>>>> 11792758 (Rebased) =======
  51. 5 >>>>>>> 31d15e66 (Fix) row :authors, &:authors_names
  52. <<<<<<< HEAD <<<<<<< HEAD
  53. 5 =======
  54. >>>>>>> 11792758 (Rebased) =======
  55. 5 >>>>>>> 31d15e66 (Fix) row :categories, &:categories_names
  56. <<<<<<< HEAD <<<<<<< HEAD
  57. 5 =======
  58. >>>>>>> 11792758 (Rebased) =======
  59. 5 >>>>>>> 31d15e66 (Fix) row :year_of_publication
  60. <<<<<<< HEAD <<<<<<< HEAD
  61. 5 =======
  62. >>>>>>> 11792758 (Rebased) =======
  63. 5 >>>>>>> 31d15e66 (Fix) row :description
  64. <<<<<<< HEAD <<<<<<< HEAD
  65. 5 =======
  66. >>>>>>> 11792758 (Rebased) =======
  67. 5 >>>>>>> 31d15e66 (Fix) row :materials
  68. <<<<<<< HEAD <<<<<<< HEAD
  69. 5 =======
  70. >>>>>>> 11792758 (Rebased) =======
  71. 5 >>>>>>> 31d15e66 (Fix) row :dimensions
  72. <<<<<<< HEAD <<<<<<< HEAD
  73. 5 =======
  74. >>>>>>> 11792758 (Rebased) =======
  75. 5 >>>>>>> 31d15e66 (Fix) row :price, &:price
  76. <<<<<<< HEAD <<<<<<< HEAD
  77. 5 =======
  78. >>>>>>> 11792758 (Rebased) =======
  79. 5 >>>>>>> 31d15e66 (Fix) row :created_at
  80. <<<<<<< HEAD <<<<<<< HEAD
  81. 5 =======
  82. >>>>>>> 11792758 (Rebased) =======
  83. 5 >>>>>>> 31d15e66 (Fix) row :updated_at
  84. end
  85. <<<<<<< HEAD <<<<<<< HEAD
  86. 5 =======
  87. >>>>>>> 11792758 (Rebased) =======
  88. 5 >>>>>>> 31d15e66 (Fix) panel :images do
  89. <<<<<<< HEAD <<<<<<< HEAD
  90. 5 =======
  91. >>>>>>> 11792758 (Rebased) =======
  92. 5 >>>>>>> 31d15e66 (Fix) table do
  93. <<<<<<< HEAD <<<<<<< HEAD
  94. 5 =======
  95. >>>>>>> 11792758 (Rebased) =======
  96. 5 >>>>>>> 31d15e66 (Fix) book.images.each do |image|
  97. <<<<<<< HEAD <<<<<<< HEAD
  98. 2 =======
  99. >>>>>>> 11792758 (Rebased) =======
  100. 2 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  101. end
  102. end
  103. end
  104. end
  105. 1 form do |f|
  106. <<<<<<< HEAD <<<<<<< HEAD
  107. 6 =======
  108. >>>>>>> 11792758 (Rebased) =======
  109. 6 >>>>>>> 31d15e66 (Fix) f.inputs do
  110. <<<<<<< HEAD <<<<<<< HEAD
  111. 6 =======
  112. >>>>>>> 11792758 (Rebased) =======
  113. 6 >>>>>>> 31d15e66 (Fix) f.input :title
  114. <<<<<<< HEAD <<<<<<< HEAD
  115. 6 =======
  116. >>>>>>> 11792758 (Rebased) =======
  117. 6 >>>>>>> 31d15e66 (Fix) f.input :description
  118. <<<<<<< HEAD <<<<<<< HEAD
  119. 6 =======
  120. >>>>>>> 11792758 (Rebased) =======
  121. 6 >>>>>>> 31d15e66 (Fix) f.input :year_of_publication
  122. <<<<<<< HEAD <<<<<<< HEAD
  123. 6 =======
  124. >>>>>>> 11792758 (Rebased) =======
  125. 6 >>>>>>> 31d15e66 (Fix) f.input :price_cents
  126. <<<<<<< HEAD <<<<<<< HEAD
  127. 6 =======
  128. >>>>>>> 11792758 (Rebased) =======
  129. 6 >>>>>>> 31d15e66 (Fix) f.input :materials
  130. <<<<<<< HEAD <<<<<<< HEAD
  131. 6 =======
  132. >>>>>>> 11792758 (Rebased) =======
  133. 6 >>>>>>> 31d15e66 (Fix) f.input :dimensions
  134. <<<<<<< HEAD <<<<<<< HEAD
  135. 6 =======
  136. >>>>>>> 11792758 (Rebased) =======
  137. 6 >>>>>>> 31d15e66 (Fix) f.input :quantity
  138. <<<<<<< HEAD <<<<<<< HEAD
  139. 6 =======
  140. >>>>>>> 11792758 (Rebased) =======
  141. 6 >>>>>>> 31d15e66 (Fix) f.input :categories, as: :select, collection: Category.all
  142. <<<<<<< HEAD <<<<<<< HEAD
  143. 6 =======
  144. >>>>>>> 11792758 (Rebased) =======
  145. 6 >>>>>>> 31d15e66 (Fix) f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  146. <<<<<<< HEAD <<<<<<< HEAD
  147. 6 =======
  148. >>>>>>> 11792758 (Rebased) =======
  149. 6 >>>>>>> 31d15e66 (Fix) f.input :images, as: :file, input_html: { multiple: true }
  150. end
  151. <<<<<<< HEAD <<<<<<< HEAD
  152. 6 =======
  153. >>>>>>> 11792758 (Rebased) =======
  154. 6 >>>>>>> 31d15e66 (Fix) panel :images do
  155. <<<<<<< HEAD <<<<<<< HEAD
  156. 6 =======
  157. >>>>>>> 11792758 (Rebased) =======
  158. 6 >>>>>>> 31d15e66 (Fix) f.object.images.each do |image|
  159. <<<<<<< HEAD <<<<<<< HEAD
  160. 1 =======
  161. >>>>>>> 11792758 (Rebased) =======
  162. 1 >>>>>>> 31d15e66 (Fix) span image_tag image.variant(resize_to_limit: [100, 100])
  163. <<<<<<< HEAD <<<<<<< HEAD
  164. 1 =======
  165. >>>>>>> 11792758 (Rebased) =======
  166. 1 >>>>>>> 31d15e66 (Fix) span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  167. data: { confirm: "Delete #{image.filename}?" })
  168. end
  169. end
  170. <<<<<<< HEAD <<<<<<< HEAD
  171. 6 =======
  172. >>>>>>> 11792758 (Rebased) =======
  173. 6 >>>>>>> 31d15e66 (Fix) f.actions
  174. end
  175. 1 member_action :delete_image, method: :delete do
  176. <<<<<<< HEAD <<<<<<< HEAD
  177. 1 =======
  178. >>>>>>> 11792758 (Rebased) =======
  179. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD ActiveStorage::Attachment.find(params[:id]).purge_later ======= ActiveStorage::Attachment.find(params[:id]).destroy >>>>>>> 11792758 (Rebased) ======= ActiveStorage::Attachment.find(params[:id]).purge_later >>>>>>> ef483b6d (Fix)
  180. <<<<<<< HEAD <<<<<<< HEAD
  181. 1 =======
  182. >>>>>>> 11792758 (Rebased) =======
  183. 1 >>>>>>> 31d15e66 (Fix) redirect_back(fallback_location: edit_admin_book_path)
  184. end
  185. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 39 =======
  5. 1 >>>>>>> 11792758 (Rebased) =======
  6. 39 >>>>>>> 31d15e66 (Fix) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  7. 1 action_item only: :show do
  8. link_to 'SideKiq View', sidekiq_web_path
  9. end
  10. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  11. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  12. span class: 'blank_slate' do
  13. span I18n.t('active_admin.dashboard_welcome.welcome')
  14. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  15. end
  16. end
  17. end
  18. <<<<<<< HEAD end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. ======= >>>>>>> ef483b6d (Fix) end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/controllers/application_controller.rb

100.0% lines covered

<<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 1 relevant lines. 1 lines covered and >>>>>>> 6da9530 (Featire specs) 0 lines missed.
    
  1. 1 class ApplicationController < ActionController::Base
  2. <<<<<<< HEAD
  3. 1 before_action :user_or_guest_have_order
  4. 1 private
  5. 1 def user_or_guest_have_order
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. 164 =======
  8. 166 >>>>>>> ef483b6d (Fix) =======
  9. 164 >>>>>>> d68e8240 (Fix) if current_user
  10. 36 session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
  11. 36 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  12. <<<<<<< HEAD <<<<<<< HEAD
  13. 128 =======
  14. 130 >>>>>>> ef483b6d (Fix) =======
  15. 128 >>>>>>> d68e8240 (Fix) elsif session[:order_id].nil?
  16. 52 session[:order_id] = Order.create.id
  17. 52 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  18. end
  19. end
  20. =======
  21. >>>>>>> 6da9530 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) 93.33% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) 93.33% ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= 93.33% ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 93.33% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= 93.33% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    
  1. 1 class BooksController < ApplicationController
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) def index ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) def index ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> e3e66f3 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 6da9530 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
  6. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) def index ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 9bfbd88 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 824bb2b (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> e3e66f3 (Featire specs)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD ======= =======
  10. ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) def index
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs)
  13. >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 009401d (Featire specs) 24 =======
  14. 24 <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) =======
  15. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  16. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  17. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  18. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  19. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
  20. 25 >>>>>>> c033601 (Rebased) ======= >>>>>>> 6da9530 (Featire specs)
  21. 25 =======
  22. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  23. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @books_count = Book.count
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> 752f0c0 (Featire specs) =======
  27. >>>>>>> 4e81ea2 (Featire specs) 24 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  28. 24 <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) =======
  29. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  30. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  31. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  32. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  33. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
  34. 25 >>>>>>> c033601 (Rebased) ======= >>>>>>> 6da9530 (Featire specs)
  35. 25 =======
  36. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  37. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) @categories = Category.all
  38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  39. 24 =======
  40. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  41. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  42. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs)
  43. 25 =======
  44. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  45. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  46. <<<<<<< HEAD
  47. ======= <<<<<<< HEAD <<<<<<< HEAD
  48. =======
  49. 24 >>>>>>> d0dc1f1 (Featire specs) =======
  50. 24 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= <<<<<<< HEAD <<<<<<< HEAD per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs)
  51. =======
  52. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  53. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  54. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= =======
  55. >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  57. 25 =======
  58. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  59. 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) =======
  60. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) def index
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  62. 24 <<<<<<< HEAD ======= =======
  63. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
  64. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  65. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  66. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  67. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  68. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  69. 25 =======
  70. 25 >>>>>>> 9620751 (Featire specs) =======
  71. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  72. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  73. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  74. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  75. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  76. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  77. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  78. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  79. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  80. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  81. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  82. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  83. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  84. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  85. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  86. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  87. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  88. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  89. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  90. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  91. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  92. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  93. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  94. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @books_count = Book.count
  95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  96. 24 <<<<<<< HEAD ======= =======
  97. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
  98. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  99. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  100. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  101. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  102. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  103. 25 =======
  104. 25 >>>>>>> 9620751 (Featire specs) =======
  105. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  106. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  107. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  108. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  109. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  110. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs)
  111. 25 >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  112. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  113. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  114. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  115. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  116. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  117. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  118. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  119. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  120. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  121. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  122. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  123. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  124. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  125. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  126. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  127. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  128. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @categories = Category.all
  129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  130. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased)
  131. 24 =======
  132. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  133. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  134. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  135. 25 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  136. 25 =======
  137. 25 >>>>>>> 9620751 (Featire specs) =======
  138. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  139. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  140. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  141. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
  142. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  143. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  144. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  145. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  146. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  147. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b832d45 (Featire specs) ======= =======
  148. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
  149. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) =======
  150. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  151. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
  152. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
  153. 25 =======
  154. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  155. <<<<<<< HEAD
  156. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  157. =======
  158. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  159. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  160. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  161. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  162. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) =======
  163. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  164. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
  165. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  166. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
  167. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  168. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  169. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD def index ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) def index
  170. 25 @books_count = Book.count
  171. 25 @categories = Category.all
  172. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  173. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) =======
  174. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  175. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) =======
  176. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  177. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  178. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  179. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
  180. 25 @books_count = Book.count
  181. 25 @categories = Category.all
  182. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
  183. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) =======
  184. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) =======
  185. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) =======
  186. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  187. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  188. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= =======
  189. 25 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  190. <<<<<<< HEAD per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  191. <<<<<<< HEAD
  192. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  193. >>>>>>> 752f0c0 (Featire specs) =======
  194. >>>>>>> 4e81ea2 (Featire specs) =======
  195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
  196. >>>>>>> c7a726c5 (Rebased)
  197. 25 <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) def index
  198. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  199. 24 <<<<<<< HEAD ======= =======
  200. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  201. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @books_count = Book.count
  202. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  203. 24 <<<<<<< HEAD ======= =======
  204. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  205. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) @categories = Category.all
  206. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  207. 24 sorted_books = BookQuery.query(params).paginate(page: params[:page],
  208. per_page: PAGINATION_PER_PAGE) >>>>>>> 9bfbd88 (Featire specs)
  209. <<<<<<< HEAD ======= =======
  210. >>>>>>> 752f0c0 (Featire specs) =======
  211. >>>>>>> 4e81ea2 (Featire specs) =======
  212. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  213. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
  214. =======
  215. >>>>>>> 752f0c0 (Featire specs) =======
  216. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  217. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  218. 24 >>>>>>> 08edf50 (Featire specs) =======
  219. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  220. 24 <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
  221. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs)
  222. 25 <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
  223. 25 >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
  224. 25 <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
  225. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  226. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  227. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  228. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  229. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  230. ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  231. ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)
  232. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  233. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  234. >>>>>>> 752f0c0 (Featire specs) =======
  235. >>>>>>> 4e81ea2 (Featire specs) =======
  236. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  237. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  238. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  239. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  240. =======
  241. >>>>>>> 752f0c0 (Featire specs) =======
  242. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  243. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  244. 24 >>>>>>> 08edf50 (Featire specs) =======
  245. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  246. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  247. 24 <<<<<<< HEAD ======= =======
  248. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  249. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
  250. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  251. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  252. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) =======
  253. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= =======
  254. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
  255. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
  256. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  257. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
  258. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) =======
  259. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) =======
  260. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  261. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  262. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  263. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  264. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  265. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages)
  266. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= =======
  267. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
  268. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
  269. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= =======
  270. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
  271. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  272. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= =======
  273. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs)
  274. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  275. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  276. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  277. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  278. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  279. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  280. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  281. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs)
  282. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  283. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  284. =======
  285. >>>>>>> 752f0c0 (Featire specs) =======
  286. >>>>>>> 4e81ea2 (Featire specs) =======
  287. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  288. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  289. >>>>>>> e3e66f3 (Featire specs)
  290. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  291. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  292. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  293. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  294. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) =======
  295. 25 <<<<<<< HEAD =======
  296. 25 >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  297. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  298. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  299. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  300. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  301. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  302. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  303. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  304. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  305. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  306. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  307. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) =======
  308. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= =======
  309. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= =======
  310. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  311. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= =======
  312. 25 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs)
  313. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  314. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  315. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD =======
  316. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  317. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  318. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  319. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  320. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 0d6dd12 (Manifest_cache true) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> e3e66f3 (Featire specs)
  321. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  322. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  323. =======
  324. >>>>>>> 752f0c0 (Featire specs) =======
  325. >>>>>>> 4e81ea2 (Featire specs) =======
  326. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  327. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  328. >>>>>>> e3e66f3 (Featire specs)
  329. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
  330. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  331. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  332. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  333. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) =======
  334. 25 <<<<<<< HEAD =======
  335. 25 >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  336. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
  337. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  338. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  339. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  340. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
  341. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  342. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  343. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  344. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  345. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  346. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= =======
  347. 24 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) respond_to do |format|
  348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  349. =======
  350. >>>>>>> 752f0c0 (Featire specs) =======
  351. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  352. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  353. 24 >>>>>>> 08edf50 (Featire specs) =======
  354. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  355. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
  356. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  357. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  358. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  359. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  360. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  361. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  362. 24 <<<<<<< HEAD ======= =======
  363. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  364. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  365. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  366. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  367. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  368. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  369. 25 =======
  370. 25 >>>>>>> 9620751 (Featire specs) ======= =======
  371. 25 >>>>>>> 6da9530 (Featire specs) =======
  372. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  373. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  374. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  375. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  376. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  377. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  378. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  379. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  380. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  381. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  382. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  383. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  384. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  385. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  386. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  387. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  388. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  389. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  390. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  391. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  392. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  393. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) format.html
  394. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
  395. =======
  396. >>>>>>> 752f0c0 (Featire specs) =======
  397. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  398. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  399. 24 >>>>>>> 08edf50 (Featire specs) =======
  400. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  401. 25 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
  402. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  403. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  404. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  405. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
  406. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  407. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  408. 24 <<<<<<< HEAD ======= =======
  409. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  410. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  411. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  412. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  413. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  414. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  415. 25 =======
  416. 25 >>>>>>> 9620751 (Featire specs) ======= =======
  417. 25 >>>>>>> 6da9530 (Featire specs) =======
  418. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  419. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  420. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
  421. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  422. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  423. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  424. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  425. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  426. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
  427. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  428. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
  429. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
  430. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  431. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  432. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  433. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  434. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  435. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
  436. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  437. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  438. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
  439. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) format.json do
  440. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  441. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  442. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  443. =======
  444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  445. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  446. =======
  447. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  448. >>>>>>> 94841b5 (Featire specs) =======
  449. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  450. =======
  451. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  452. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  453. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  454. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  455. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  456. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  457. =======
  458. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  459. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  460. >>>>>>> e54deeb (Featire specs) =======
  461. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  462. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  463. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  464. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  465. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  466. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  467. =======
  468. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  469. >>>>>>> 9c0d812 (Featire specs) =======
  470. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  471. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  472. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  473. =======
  474. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  475. >>>>>>> 9c0d812 (Featire specs) =======
  476. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  477. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  478. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  479. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  480. =======
  481. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  482. >>>>>>> 9c0d812 (Featire specs) =======
  483. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  484. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  485. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  486. =======
  487. >>>>>>> 752f0c0 (Featire specs) =======
  488. >>>>>>> 4e81ea2 (Featire specs) =======
  489. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  490. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  491. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  492. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  493. =======
  494. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  495. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  497. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  498. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  499. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  500. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  501. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  502. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  503. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  504. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  505. =======
  506. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  507. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  508. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  509. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  510. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  511. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  512. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  513. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  514. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  515. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  519. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  520. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  521. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  522. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  523. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  524. =======
  525. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  526. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  527. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  528. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  529. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  530. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  531. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  532. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  533. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 render json: {
  534. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  535. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  536. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  537. =======
  538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  539. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  540. =======
  541. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  542. >>>>>>> 94841b5 (Featire specs) =======
  543. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  544. =======
  545. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  546. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  547. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  548. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  549. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  550. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  551. =======
  552. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  553. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  554. >>>>>>> e54deeb (Featire specs) =======
  555. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  556. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  557. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  558. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  559. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  560. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  561. =======
  562. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  563. >>>>>>> 9c0d812 (Featire specs) =======
  564. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  565. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  566. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  567. =======
  568. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  569. >>>>>>> 9c0d812 (Featire specs) =======
  570. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  571. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  572. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  573. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  574. =======
  575. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  576. >>>>>>> 9c0d812 (Featire specs) =======
  577. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  578. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  579. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  580. =======
  581. >>>>>>> 752f0c0 (Featire specs) =======
  582. >>>>>>> 4e81ea2 (Featire specs) =======
  583. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  584. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  585. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  586. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  587. =======
  588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  589. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  590. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  591. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  592. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  593. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  594. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  595. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  596. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  597. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  598. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  599. =======
  600. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  601. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  602. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  603. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  604. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  605. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  606. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  607. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  608. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  609. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  610. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  611. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  612. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  613. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  614. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  615. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  616. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  617. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  618. =======
  619. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  620. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  621. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  622. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  623. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  624. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  625. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  626. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  627. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD entries: render_to_string(partial: 'books/index/books', formats: [:html]), ======= entries: render_to_string(partial: 'books', formats: [:html]), >>>>>>> 6da9530 (Featire specs)
  628. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  629. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  630. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  631. =======
  632. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  633. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  634. =======
  635. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 94841b5 (Featire specs) =======
  637. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  638. =======
  639. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  640. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  641. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  642. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  643. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  644. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  645. =======
  646. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  647. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  648. >>>>>>> e54deeb (Featire specs) =======
  649. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  650. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  651. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  652. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  653. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  654. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  655. =======
  656. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  657. >>>>>>> 9c0d812 (Featire specs) =======
  658. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  659. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  660. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  661. =======
  662. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  663. >>>>>>> 9c0d812 (Featire specs) =======
  664. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  665. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  666. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  667. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  668. =======
  669. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  670. >>>>>>> 9c0d812 (Featire specs) =======
  671. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  672. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  673. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  674. =======
  675. >>>>>>> 752f0c0 (Featire specs) =======
  676. >>>>>>> 4e81ea2 (Featire specs) =======
  677. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  678. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  679. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  680. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  681. =======
  682. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  683. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  684. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  685. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  686. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  687. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  688. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  689. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  690. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  691. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  692. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  693. =======
  694. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  697. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  698. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  699. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  700. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  701. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  702. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  703. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  704. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  705. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  706. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  707. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  708. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  709. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  710. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  711. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  712. =======
  713. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  714. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  715. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  717. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  721. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) pagination: view_context.will_paginate(@books)
  722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  723. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  724. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  725. =======
  726. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  727. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  728. =======
  729. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  730. >>>>>>> 94841b5 (Featire specs) =======
  731. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  732. =======
  733. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  734. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  735. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  736. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  737. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  738. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  739. =======
  740. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  741. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  742. >>>>>>> e54deeb (Featire specs) =======
  743. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  744. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  745. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  746. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  747. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  748. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  749. =======
  750. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  751. >>>>>>> 9c0d812 (Featire specs) =======
  752. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  753. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  754. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  755. =======
  756. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  757. >>>>>>> 9c0d812 (Featire specs) =======
  758. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  759. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  760. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  761. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  762. =======
  763. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  764. >>>>>>> 9c0d812 (Featire specs) =======
  765. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  766. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  767. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  768. =======
  769. >>>>>>> 752f0c0 (Featire specs) =======
  770. >>>>>>> 4e81ea2 (Featire specs) =======
  771. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  772. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  773. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  774. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  775. =======
  776. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  777. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  778. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  779. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  780. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  781. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  782. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  783. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  784. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  785. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  786. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  787. =======
  788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  789. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  790. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  791. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  792. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  793. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  794. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  795. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  796. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  797. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  798. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  799. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  800. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  801. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  802. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  803. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  804. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  805. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  806. =======
  807. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  808. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  809. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  810. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  811. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  812. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  813. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  814. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  815. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) }
  816. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  817. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  818. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  819. =======
  820. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  821. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  822. =======
  823. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  824. >>>>>>> 94841b5 (Featire specs) =======
  825. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  826. =======
  827. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  828. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  829. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  830. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  831. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  832. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  833. =======
  834. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  835. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  836. >>>>>>> e54deeb (Featire specs) =======
  837. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  838. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  839. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  840. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  841. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  842. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  843. =======
  844. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  845. >>>>>>> 9c0d812 (Featire specs) =======
  846. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  847. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  848. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  849. =======
  850. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  851. >>>>>>> 9c0d812 (Featire specs) =======
  852. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  853. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  854. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  855. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  856. =======
  857. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  858. >>>>>>> 9c0d812 (Featire specs) =======
  859. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  860. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  861. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  862. =======
  863. >>>>>>> 752f0c0 (Featire specs) =======
  864. >>>>>>> 4e81ea2 (Featire specs) =======
  865. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  866. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  867. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  868. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  869. =======
  870. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  871. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  872. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  873. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  874. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  875. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  876. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  877. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  878. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  879. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  880. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  881. =======
  882. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  883. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  884. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  885. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  886. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  887. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  888. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  889. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  890. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  891. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  892. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  893. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  894. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  895. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  896. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  897. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  898. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  899. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  900. =======
  901. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  902. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  903. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  904. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  905. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  906. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  907. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  908. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  909. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  910. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  911. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  912. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  913. =======
  914. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  915. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  916. =======
  917. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  918. >>>>>>> 94841b5 (Featire specs) =======
  919. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  920. =======
  921. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  922. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  923. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  924. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  925. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  926. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  927. =======
  928. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  929. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  930. >>>>>>> e54deeb (Featire specs) =======
  931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  932. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  933. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  934. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  935. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  936. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  937. =======
  938. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  939. >>>>>>> 9c0d812 (Featire specs) =======
  940. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  941. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  942. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  943. =======
  944. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  945. >>>>>>> 9c0d812 (Featire specs) =======
  946. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  947. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  948. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  949. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  950. =======
  951. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  952. >>>>>>> 9c0d812 (Featire specs) =======
  953. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  954. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  955. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  956. =======
  957. >>>>>>> 752f0c0 (Featire specs) =======
  958. >>>>>>> 4e81ea2 (Featire specs) =======
  959. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  960. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  961. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  962. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  963. =======
  964. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  965. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  967. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  968. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  969. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  970. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  971. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  972. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  973. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  974. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  975. =======
  976. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  977. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  978. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  979. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  980. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  981. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  982. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  983. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  984. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  985. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  989. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  990. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  991. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  992. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  993. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  994. =======
  995. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  996. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  997. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  998. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  999. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1000. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1001. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1002. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1003. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  1004. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1005. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1006. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1007. =======
  1008. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1009. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1010. =======
  1011. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1012. >>>>>>> 94841b5 (Featire specs) =======
  1013. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1014. =======
  1015. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1016. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1017. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1018. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1019. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1020. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1021. =======
  1022. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1023. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1024. >>>>>>> e54deeb (Featire specs) =======
  1025. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1026. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1027. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1028. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1029. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1030. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1031. =======
  1032. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1033. >>>>>>> 9c0d812 (Featire specs) =======
  1034. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1035. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1036. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1037. =======
  1038. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1039. >>>>>>> 9c0d812 (Featire specs) =======
  1040. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1041. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1042. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1043. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1044. =======
  1045. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1046. >>>>>>> 9c0d812 (Featire specs) =======
  1047. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1048. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1049. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1050. =======
  1051. >>>>>>> 752f0c0 (Featire specs) =======
  1052. >>>>>>> 4e81ea2 (Featire specs) =======
  1053. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1054. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1055. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1056. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1057. =======
  1058. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1059. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1060. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1061. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1062. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1063. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1064. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1065. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1066. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1067. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1068. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1069. =======
  1070. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1071. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1072. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1073. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1074. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1075. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1076. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1077. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1078. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1079. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1080. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1081. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1082. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1083. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1084. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1085. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1086. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1087. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1088. =======
  1089. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1090. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1091. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1092. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1093. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1094. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1095. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1096. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1097. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  1098. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1099. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1100. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1101. =======
  1102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1103. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1104. =======
  1105. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1106. >>>>>>> 94841b5 (Featire specs) =======
  1107. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1108. =======
  1109. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1110. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1111. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1112. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1113. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1114. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1115. =======
  1116. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1117. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1118. >>>>>>> e54deeb (Featire specs) =======
  1119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1120. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1121. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1122. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1123. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1124. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1125. =======
  1126. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1127. >>>>>>> 9c0d812 (Featire specs) =======
  1128. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1129. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1130. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1131. =======
  1132. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1133. >>>>>>> 9c0d812 (Featire specs) =======
  1134. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1135. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1136. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1137. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1138. =======
  1139. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1140. >>>>>>> 9c0d812 (Featire specs) =======
  1141. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1142. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1143. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1144. =======
  1145. >>>>>>> 752f0c0 (Featire specs) =======
  1146. >>>>>>> 4e81ea2 (Featire specs) =======
  1147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1149. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1150. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1151. =======
  1152. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1153. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1154. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1155. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1156. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1157. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1158. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1159. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1160. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1161. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1162. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1163. =======
  1164. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1165. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1166. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1167. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1168. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1169. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1170. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1171. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1172. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1173. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1174. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1175. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1176. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1177. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1178. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1179. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1180. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1181. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1182. =======
  1183. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1184. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1185. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1186. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1187. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1188. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1189. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1190. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1191. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1192. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1193. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1194. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1195. =======
  1196. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1197. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1198. =======
  1199. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1200. >>>>>>> 94841b5 (Featire specs) =======
  1201. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1202. =======
  1203. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1204. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1205. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1206. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1207. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1208. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1209. =======
  1210. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1211. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1212. >>>>>>> e54deeb (Featire specs) =======
  1213. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1214. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1215. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1216. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1217. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1218. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1219. =======
  1220. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1221. >>>>>>> 9c0d812 (Featire specs) =======
  1222. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1223. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1224. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1225. =======
  1226. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1227. >>>>>>> 9c0d812 (Featire specs) =======
  1228. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1229. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1230. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1231. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1232. =======
  1233. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1234. >>>>>>> 9c0d812 (Featire specs) =======
  1235. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1236. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1237. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1238. =======
  1239. >>>>>>> 752f0c0 (Featire specs) =======
  1240. >>>>>>> 4e81ea2 (Featire specs) =======
  1241. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1242. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1243. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1244. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1245. =======
  1246. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1247. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1248. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1249. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1250. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1251. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1252. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1253. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1254. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1255. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1256. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1257. =======
  1258. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1259. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1260. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1262. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1266. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1267. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1268. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1269. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1270. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1271. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1272. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1273. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1274. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1275. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1276. =======
  1277. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1278. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1279. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1280. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1281. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1282. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1283. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1284. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1285. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 def show
  1286. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1287. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1288. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  1289. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
  1290. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1291. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1292. =======
  1293. >>>>>>> 752f0c0 (Featire specs) =======
  1294. >>>>>>> 4e81ea2 (Featire specs) =======
  1295. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  1296. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1297. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  1298. 11 =======
  1299. 11 >>>>>>> 9620751 (Featire specs) =======
  1300. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  1301. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  1302. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  1303. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1304. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1305. =======
  1306. >>>>>>> 752f0c0 (Featire specs) =======
  1307. >>>>>>> 4e81ea2 (Featire specs) =======
  1308. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1309. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1310. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1311. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) =======
  1312. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) =======
  1313. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) =======
  1314. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) =======
  1315. 15 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1316. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1317. =======
  1318. >>>>>>> 752f0c0 (Featire specs) =======
  1319. >>>>>>> 4e81ea2 (Featire specs) =======
  1320. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1321. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
  1322. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1323. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= =======
  1324. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1325. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1326. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
  1327. 11 =======
  1328. 7 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1329. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1330. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= =======
  1331. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1332. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1333. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1334. 11 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= book = Book.find_by(id: params[:id]) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1335. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1336. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1337. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1338. =======
  1339. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1340. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1341. =======
  1342. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1343. >>>>>>> 94841b5 (Featire specs) =======
  1344. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1345. =======
  1346. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1347. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1348. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1349. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1350. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1351. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  1352. =======
  1353. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1354. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1355. >>>>>>> e54deeb (Featire specs) =======
  1356. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1357. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1358. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1359. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1360. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1361. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1362. =======
  1363. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1364. >>>>>>> 9c0d812 (Featire specs) =======
  1365. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1366. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1367. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1368. =======
  1369. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1370. >>>>>>> 9c0d812 (Featire specs) =======
  1371. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1372. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1373. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1374. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1375. =======
  1376. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1377. >>>>>>> 9c0d812 (Featire specs) =======
  1378. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1379. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1380. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1381. =======
  1382. >>>>>>> 752f0c0 (Featire specs) =======
  1383. >>>>>>> 4e81ea2 (Featire specs) =======
  1384. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1385. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1386. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1387. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1388. =======
  1389. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1390. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1391. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1392. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1393. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1394. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1395. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1396. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1397. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1398. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1399. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1400. =======
  1401. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1402. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1403. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1404. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1405. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1406. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1407. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1408. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1409. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1410. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1412. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1413. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1414. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1415. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1416. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  1417. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1418. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
  1419. =======
  1420. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1421. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1422. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1423. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1424. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1425. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1426. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1427. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1428. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1429. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1430. 11 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1431. 11 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
  1432. 11 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
  1433. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1434. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1435. =======
  1436. >>>>>>> 752f0c0 (Featire specs) =======
  1437. >>>>>>> 4e81ea2 (Featire specs) =======
  1438. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  1439. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1440. 11 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  1441. 11 =======
  1442. 11 >>>>>>> 9620751 (Featire specs) =======
  1443. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
  1444. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  1445. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1446. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1447. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1448. =======
  1449. >>>>>>> 752f0c0 (Featire specs) =======
  1450. >>>>>>> 4e81ea2 (Featire specs) =======
  1451. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1452. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1453. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1454. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1455. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1456. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1457. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1458. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
  1459. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1460. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
  1461. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1462. =======
  1463. >>>>>>> 752f0c0 (Featire specs) =======
  1464. >>>>>>> 4e81ea2 (Featire specs) =======
  1465. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
  1466. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1467. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1468. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1469. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1470. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
  1471. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1472. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  1473. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  1474. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  1475. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
  1476. 11 =======
  1477. 7 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1478. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1479. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  1480. 11 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD if book.nil? ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1481. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
  1482. ======= >>>>>>> 824bb2b (Featire specs) =======
  1483. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  1484. =======
  1485. >>>>>>> 752f0c0 (Featire specs) =======
  1486. >>>>>>> 4e81ea2 (Featire specs) =======
  1487. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
  1488. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6da9530 (Featire specs)
  1489. redirect_to books_path
  1490. else
  1491. 11 <<<<<<< HEAD <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1492. 11 >>>>>>> a5d032d (Fix) @book = book.decorate ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @book = book.decorate >>>>>>> 6da9530 (Featire specs)
  1493. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1494. =======
  1495. >>>>>>> a5d032d (Fix) =======
  1496. >>>>>>> 6da9530 (Featire specs) end
  1497. <<<<<<< HEAD <<<<<<< HEAD
  1498. <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
  1499. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs)
  1500. =======
  1501. >>>>>>> 752f0c0 (Featire specs) =======
  1502. >>>>>>> 4e81ea2 (Featire specs) =======
  1503. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  1504. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix)
  1505. redirect_to books_path
  1506. else
  1507. 11 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1508. 11 >>>>>>> a5d032d (Fix) @book = book.decorate ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= if book.nil? >>>>>>> c7a726c5 (Rebased)
  1509. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1510. =======
  1511. >>>>>>> a5d032d (Fix) end
  1512. <<<<<<< HEAD
  1513. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price)
  1514. >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix)
  1515. >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
  1516. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1517. =======
  1518. >>>>>>> 752f0c0 (Featire specs) =======
  1519. >>>>>>> 4e81ea2 (Featire specs) =======
  1520. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1521. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  1522. redirect_to books_path
  1523. else
  1524. <<<<<<< HEAD <<<<<<< HEAD
  1525. 15 =======
  1526. 11 >>>>>>> c7a726c5 (Rebased) =======
  1527. 15 >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  1528. <<<<<<< HEAD <<<<<<< HEAD
  1529. 15 =======
  1530. 11 >>>>>>> 31d15e66 (Fix) =======
  1531. 15 >>>>>>> ef483b6d (Fix) >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) @book = book.decorate
  1532. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix)
  1533. =======
  1534. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
  1535. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 31d15e66 (Fix) end
  1536. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> ef483b6d (Fix)
  1537. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1538. <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  1539. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1540. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1541. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1542. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1543. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1544. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1545. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1546. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  1547. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1548. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1549. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1550. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1551. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1552. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1553. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1554. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1555. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1556. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1557. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1558. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  1559. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1560. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1561. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1562. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1563. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  1564. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  1565. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1566. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1567. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1568. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1569. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1570. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1571. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1572. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  1573. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1574. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  1575. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1576. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
  1577. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1578. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1579. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
  1580. ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
  1581. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1582. =======
  1583. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1584. >>>>>>> 94841b5 (Featire specs) =======
  1585. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
  1586. =======
  1587. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1588. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  1589. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1590. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  1591. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1592. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  1593. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1594. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  1595. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1596. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1597. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1598. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1599. =======
  1600. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1601. >>>>>>> 9c0d812 (Featire specs) =======
  1602. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1603. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
  1604. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
  1605. ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price)
  1606. ======= =======
  1607. =======
  1608. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
  1609. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1610. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
  1611. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1612. >>>>>>> 9c0d812 (Featire specs) =======
  1613. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  1614. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
  1615. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
  1616. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
  1617. =======
  1618. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1619. >>>>>>> 9c0d812 (Featire specs) =======
  1620. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
  1621. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
  1622. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1623. =======
  1624. >>>>>>> 752f0c0 (Featire specs) =======
  1625. >>>>>>> 4e81ea2 (Featire specs) =======
  1626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
  1627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
  1628. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1629. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1630. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1631. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  1632. =======
  1633. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1634. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  1635. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1636. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1637. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1638. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
  1639. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  1640. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1641. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
  1642. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  1643. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  1644. =======
  1645. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1646. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  1647. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  1648. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1649. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
  1650. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  1651. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  1652. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  1653. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  13. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  15. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
  17. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
  18. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  19. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
  20. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
  21. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  24. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
  25. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
  26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  27. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
  28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  29. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  30. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  31. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class HomeController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  5. 13 =======
  6. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  7. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  8. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  9. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) =======
  10. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
  11. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  12. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  13. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) =======
  14. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  15. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  16. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) =======
  17. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  18. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  19. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  20. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  21. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  22. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  23. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  24. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  25. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  26. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  27. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  28. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  29. <<<<<<< HEAD <<<<<<< HEAD
  30. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  31. 13 =======
  32. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  33. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  34. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  35. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) =======
  36. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) =======
  37. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
  38. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) =======
  39. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  40. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
  41. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
  42. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
  43. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
  44. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  45. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
  46. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) @best_sellers = best_sellers
  47. end
  48. 1 private
  49. 1 def best_sellers
  50. <<<<<<< HEAD <<<<<<< HEAD
  51. 13 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  52. 13 =======
  53. 3 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  54. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  55. 3 >>>>>>> 4e81ea2 (Featire specs) =======
  56. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) =======
  57. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
  58. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  59. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
  60. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) =======
  61. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  62. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  63. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) =======
  64. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
  65. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
  66. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
  67. 13 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
  68. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  69. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  70. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  71. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
  72. 13 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
  73. 3 >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs)
  74. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  75. 13 >>>>>>> a5d032d (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) BookDecorator.decorate_collection(Book.first(4)) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  76. end
  77. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/order_books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD 80.65% ======= 90.32% >>>>>>> ef483b6d (Fix) ======= 80.65% >>>>>>> d68e8240 (Fix) lines covered

31 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 25 lines covered and 6 lines missed. ======= 28 lines covered and 3 lines missed. >>>>>>> ef483b6d (Fix) ======= 25 lines covered and 6 lines missed. >>>>>>> d68e8240 (Fix)
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. <<<<<<< HEAD <<<<<<< HEAD
  20. =======
  21. 1 >>>>>>> ef483b6d (Fix) =======
  22. >>>>>>> d68e8240 (Fix) product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  23. <<<<<<< HEAD <<<<<<< HEAD
  24. =======
  25. 1 >>>>>>> ef483b6d (Fix) =======
  26. >>>>>>> d68e8240 (Fix) if product.destroy
  27. <<<<<<< HEAD <<<<<<< HEAD
  28. =======
  29. 1 >>>>>>> ef483b6d (Fix) =======
  30. >>>>>>> d68e8240 (Fix) redirect_to orders_path, notice: I18n.t('order.messages.delete')
  31. else
  32. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  33. end
  34. end
  35. 1 def update_quantity
  36. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  37. 2 book = Book.find(params[:book_id])
  38. 2 order = Order.find(params[:order_id])
  39. 2 coupon = Coupon.find_by(code: params[:code])
  40. 2 respond_to do |format|
  41. 2 format.html
  42. 2 format.json do
  43. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  44. end
  45. end
  46. end
  47. 1 private
  48. 1 def order_item_params
  49. params.permit(%i[book_id quantity order_id])
  50. end
  51. 1 def update_order_last_action
  52. <<<<<<< HEAD <<<<<<< HEAD
  53. 6 =======
  54. 7 >>>>>>> ef483b6d (Fix) =======
  55. 6 >>>>>>> d68e8240 (Fix) Order.find(session[:order_id]).update(last_action: DateTime.now)
  56. end
  57. end

app/controllers/orders_controller.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class OrdersController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 7 =======
  5. 8 >>>>>>> ef483b6d (Fix) =======
  6. 7 >>>>>>> d68e8240 (Fix) @cart = Order.find(session[:order_id]).decorate
  7. end
  8. 1 def registration_without_password; end
  9. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 <<<<<<< HEAD <<<<<<< HEAD if @review.save ======= return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save >>>>>>> c7a726c5 (Rebased) ======= if @review.save >>>>>>> fdab719f (Fix)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. >>>>>>> c7a726c5 (Rebased) =======
  9. >>>>>>> fdab719f (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD redirect_to book_path(@review.book), notice: I18n.t('review.success') ======= redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') >>>>>>> c7a726c5 (Rebased) ======= redirect_to book_path(@review.book), notice: I18n.t('review.success') >>>>>>> fdab719f (Fix)
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. =======
  12. >>>>>>> c7a726c5 (Rebased) =======
  13. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) else
  14. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ') <<<<<<< HEAD ======= end >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix)
  15. <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> c7a726c5 (Rebased) ======= end >>>>>>> fdab719f (Fix)
  16. <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. 1 >>>>>>> c7a726c5 (Rebased) =======
  19. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD end ======= private >>>>>>> c7a726c5 (Rebased) ======= end >>>>>>> fdab719f (Fix)
  20. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) private
  21. 1 <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> fdab719f (Fix) def review_params
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. >>>>>>> c7a726c5 (Rebased) =======
  25. >>>>>>> fdab719f (Fix) 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. =======
  28. >>>>>>> c7a726c5 (Rebased) =======
  29. >>>>>>> fdab719f (Fix) end
  30. <<<<<<< HEAD <<<<<<< HEAD
  31. =======
  32. >>>>>>> c7a726c5 (Rebased) =======
  33. >>>>>>> fdab719f (Fix) end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
>>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)

app/decorators/author_decorator.rb

<<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> 11792758 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) class AuthorDecorator < Draper::Decorator >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= class AuthorDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) delegate_all
  3. 1 def full_name
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  5. 3 <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  6. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD
  7. ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  8. ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 7c4ea7f (Fix)
  9. 3 <<<<<<< HEAD =======
  10. 3 >>>>>>> 6da9530 (Featire specs) =======
  11. 2 >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  12. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
  13. 2 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) =======
  14. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
  15. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
  16. 2 >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  17. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  18. 3 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
  19. 2 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  20. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  21. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
  22. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
  23. 3 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  24. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  25. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
  26. 3 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) "#{first_name} #{last_name}"
  27. end
  28. end

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

<<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 31d15e66 (Fix) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= 12 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  3. =======
  4. 1 <<<<<<< HEAD ======= ======= ======= >>>>>>> ebcdce06 (Featire specs)
  5. =======
  6. 1 decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  7. 1 <<<<<<< HEAD decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  8. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true)
  9. =======
  10. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= =======
  11. 1 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 450f4e3 (Manifest_cache true) =======
  12. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) =======
  13. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) =======
  14. >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) =======
  15. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
  16. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> bc6bc8d2 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  17. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) class BookDecorator < Draper::Decorator ======= PAGINATION_PER_PAGE = 12 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ef483b6d (Fix) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix)
  18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  19. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  20. >>>>>>> 9bfbd88 (Featire specs) =======
  21. 1 decorates_association :authors
  22. >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  23. 1 decorates_association :authors
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) =======
  25. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix)
  27. 1 class BookDecorator < Draper::Decorator ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  28. 1 decorates_association :authors
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  30. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) def self.collection_decorator_class
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  32. ======= <<<<<<< HEAD
  33. 30 =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  35. >>>>>>> bd8bda4 (Manifest_cache true) =======
  36. >>>>>>> aa7b40c (Manifest_cache true) =======
  37. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  38. >>>>>>> 183b6c5 (Manifest_cache true) =======
  39. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  40. 56 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  41. 31 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
  42. 56 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> fd3f47ab (Featire specs)
  43. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  44. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> aa3618b (Rebased) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) =======
  45. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) PaginatingDecorator
  46. end
  47. 1 delegate_all
  48. 1 def authors_names
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  50. 1 ======= <<<<<<< HEAD
  51. 89 =======
  52. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  53. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  54. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  55. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  56. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  57. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
  58. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  59. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  60. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 11792758 (Rebased) =======
  61. =======
  62. >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  63. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true)
  64. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
  65. 109 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= =======
  66. 105 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) >>>>>>> 31d15e66 (Fix) authors.map(&:full_name).join(', ')
  67. end
  68. 1 def categories_names
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  70. 12 =======
  71. 8 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  72. 8 =======
  73. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  74. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  75. 12 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  76. 12 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  77. 12 >>>>>>> e3e66f3 (Featire specs) =======
  78. >>>>>>> 11792758 (Rebased) =======
  79. 12 >>>>>>> 31d15e66 (Fix) categories.pluck(:name).join(', ')
  80. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  81. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  82. 1 def price <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  84. 121 =======
  85. >>>>>>> 11792758 (Rebased) Money.new(price_cents)
  86. <<<<<<< HEAD =======
  87. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  88. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  89. 1 def price >>>>>>> 84809242 (Featire specs)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
  92. 121 =======
  93. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  94. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  95. 125 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  96. 125 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  97. 125 >>>>>>> e3e66f3 (Featire specs) =======
  98. 144 >>>>>>> 5b7749a (Fix) =======
  99. 143 >>>>>>> 366b257 (Fix) =======
  100. 125 >>>>>>> 31d15e66 (Fix) Money.new(price_cents)
  101. end
  102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. 8 Money.new(book.price_cents * quantity)
  6. end
  7. end

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0)
  5. 27 total_price = 0
  6. 27 order_books.each do |order_book|
  7. 25 total_price += order_book.book.price_cents * order_book.quantity
  8. end
  9. 27 Money.new(total_price - (total_price * coupon))
  10. end
  11. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
  10. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end
  13. >>>>>>> 84809242 (Featire specs)
<<<<<<< HEAD =======

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. end

app/decorators/review_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class ReviewDecorator < Draper::Decorator >>>>>>> e3e66f3 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix) ======= delegate_all >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate_all >>>>>>> e3e66f3 (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix) ======= def date_time >>>>>>> 0d6dd12 (Manifest_cache true) ======= def date_time >>>>>>> e3e66f3 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> b28889f (Fix) =======
  8. 1 >>>>>>> 872e675 (Fix) =======
  9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> 5b7749a (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 0d6dd12 (Manifest_cache true) ======= created_at.strftime('%m/%d/%Y') >>>>>>> e3e66f3 (Featire specs)
  11. end
  12. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/book_decorator.rb

90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

app/decorators/user_decorator.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    
  1. 1 require 'image_processing'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 0 lines missed.
    
  1. 1 module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  2. 1 <<<<<<< HEAD def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
  3. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}"
  6. end
  7. end

app/decorators/book_decorator.rb

90.0% ======= 100.0% >>>>>>> c7a726c5 (Rebased) lines covered

<<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= 4 relevant lines. <<<<<<< HEAD 3 lines covered and >>>>>>> 75fa7e1b (Rebased) 1 lines missed. ======= ======= >>>>>>> 31d15e66 (Fix) 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator <<<<<<< HEAD ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= module ApplicationHelper >>>>>>> 0d6dd12 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
  3. 1 ======= =======
  4. 12 =======
  5. 1 >>>>>>> 49e8a6c (Rebased) =======
  6. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  7. 1 >>>>>>> e3e66f3 (Featire specs) =======
  8. 1 >>>>>>> 31d15e66 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) ======= def markdown(text) >>>>>>> 0d6dd12 (Manifest_cache true) ======= def markdown(text) >>>>>>> e3e66f3 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. =======
  11. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  12. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  13. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  14. 13 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. 13 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) delegate_all
  16. 1 def date_time
  17. <<<<<<< HEAD <<<<<<< HEAD
  18. 1 =======
  19. 17 >>>>>>> 5b7749a (Fix) =======
  20. 1 >>>>>>> 31d15e66 (Fix) created_at.strftime('%m/%d/%Y') <<<<<<< HEAD ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix) ======= Markdown.new(text).to_html.html_safe >>>>>>> 0d6dd12 (Manifest_cache true) ======= Markdown.new(text).to_html.html_safe >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) end
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
<<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 31d15e66 (Fix)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 67ab5299 (Fix)
    
  1. 1 <<<<<<< HEAD require 'image_processing'
  2. 1 ======= >>>>>>> 824bb2b (Featire specs) module ApplicationHelper
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
  4. 12 ======= ======= >>>>>>> 84809242 (Featire specs)
  5. =======
  6. >>>>>>> 824bb2b (Featire specs) 1 >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 75fa7e1b (Rebased) ======= def markdown(text) ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
  7. <<<<<<< HEAD
  8. 13 ======= <<<<<<< HEAD
  9. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs)
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> 824bb2b (Featire specs) end
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) =======
  3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  4. >>>>>>> 752f0c0 (Featire specs) =======
  5. >>>>>>> 4e81ea2 (Featire specs) =======
  6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
  7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
  8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) =======
  9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
  10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
  12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
  14. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  15. =======
  16. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
  17. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
  18. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
  19. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
  20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
  21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= =======
  22. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  23. >>>>>>> 752f0c0 (Featire specs) =======
  24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  25. >>>>>>> 5b7749a (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  27. 1 STAR_MIN = 0
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) STAR_MAX = 5
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  31. =======
  32. =======
  33. 30 =======
  34. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  35. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) PaginatingDecorator
  36. end
  37. >>>>>>> 02a399d (Manifest_cache true) =======
  38. >>>>>>> 5b7749a (Fix)
  39. 1 CATALOG_BOOK_COUNT = 3
  40. 1 BEST_SELLER_COUNT = 4
  41. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
  42. 1 def authors_names
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
  44. 1 ======= <<<<<<< HEAD
  45. 89 =======
  46. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
  47. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) authors.map(&:full_name).join(', ')
  48. end
  49. 1 def categories_names
  50. 1 categories.map(&:name).join(', ')
  51. end
  52. end

app/decorators/category_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class CategoryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD ======= <<<<<<< HEAD end

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  2. <<<<<<< HEAD
  3. ======= <<<<<<< HEAD
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
  7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
  8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
  2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) DESCRIPTION_LENGTH = 25
  3. <<<<<<< HEAD
  4. 1 def full_name
  5. 2 "#{first_name} #{last_name}" <<<<<<< HEAD ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
  6. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end
  7. end

app/decorators/book_decorator.rb

90.0% lines covered

10 relevant lines. 9 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased)
    
  1. 1 require 'monetize'
  2. <<<<<<< HEAD
  3. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  5. 1 MIN_PRICE_IN_CENTS = 0
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 0d6dd12 (Manifest_cache true) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> e3e66f3 (Featire specs)
  7. =======
  8. >>>>>>> c7a726c5 (Rebased)
  9. <<<<<<< HEAD
  10. =======
  11. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  12. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  13. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  14. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  15. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  16. 1 VALIDATES_NAME_LENGTH_MAX = 50
  17. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  18. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  19. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  20. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  21. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  22. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  23. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. ======= class BookDecorator < Draper::Decorator >>>>>>> c7a726c5 (Rebased)
  4. 1 <<<<<<< HEAD def call ======= decorates_association :authors >>>>>>> c7a726c5 (Rebased)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
  6. =======
  7. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params ======= def self.collection_decorator_class >>>>>>> c7a726c5 (Rebased)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
  9. ======= <<<<<<< HEAD
  10. 30 =======
  11. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  12. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  13. >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  14. >>>>>>> 0d6dd12 (Manifest_cache true) =======
  15. >>>>>>> e3e66f3 (Featire specs) =======
  16. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  17. 56 >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) PaginatingDecorator
  18. end
  19. 1 delegate_all
  20. 1 def authors_names
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  22. 1 ======= <<<<<<< HEAD
  23. 89 =======
  24. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  25. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  26. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 84003439 (Featire specs) =======
  27. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  28. 1 >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD
  29. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  30. 1 >>>>>>> e3e66f3 (Featire specs) =======
  31. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
  32. 101 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  33. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  34. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  35. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
  36. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
  37. 109 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) authors.map(&:full_name).join(', ')
  38. end
  39. 1 def categories_names
  40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  41. 8 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
  42. 12 =======
  43. 8 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
  44. 8 =======
  45. 12 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= =======
  46. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
  47. 12 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= =======
  48. 12 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
  49. 12 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
  50. 8 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) categories.pluck(:name).join(', ')
  51. end <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs)
  53. 1 def price <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
  54. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs)
  55. 121 Money.new(price_cents)
  56. <<<<<<< HEAD =======
  57. >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) end
  58. <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  59. 1 def price
  60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  61. 125 ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
  62. 121 =======
  63. 125 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
  64. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
  65. 125 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
  66. 125 >>>>>>> 0d6dd12 (Manifest_cache true) =======
  67. 125 >>>>>>> e3e66f3 (Featire specs) =======
  68. 144 >>>>>>> 5b7749a (Fix) =======
  69. 143 >>>>>>> 366b257 (Fix) =======
  70. 121 >>>>>>> 6da9530 (Featire specs) Money.new(price_cents)
  71. end
  72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. 8 Money.new(book.price_cents * quantity)
  6. end
  7. end

app/decorators/order_decorator.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0)
  5. 27 total_price = 0
  6. 27 order_books.each do |order_book|
  7. 25 total_price += order_book.book.price_cents * order_book.quantity
  8. end
  9. 27 Money.new(total_price - (total_price * coupon))
  10. end
  11. end
>>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) end
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. ======= ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased)
<<<<<<< HEAD
  • <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD end
  • <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= def price >>>>>>> c7a726c5 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. ======= <<<<<<< HEAD
    5. 1 =======
    6. 121 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= Money.new(price_cents) >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. >>>>>>> d782a28 (Manifest_cache true) end
    11. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. =======
    7. >>>>>>> c7a726c5 (Rebased) end
    8. <<<<<<< HEAD
    9. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 0d6dd12 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> e3e66f3 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) params = context.permitted_params
    6. <<<<<<< HEAD
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end
    ======= >>>>>>> 824bb2b (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and ======= 3 lines covered and >>>>>>> 11792758 (Rebased) 1 lines missed. ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) 0 lines missed. >>>>>>> 31d15e66 (Fix)
        
    1. 1 <<<<<<< HEAD require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) module ApplicationHelper >>>>>>> 11792758 (Rebased)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD
    7. 31 PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 90 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. =======
    4. >>>>>>> c7a726c5 (Rebased) end

    app/decorators/paginating_decorator.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% <<<<<<< HEAD ======= ======= 100.0% >>>>>>> 872e675 (Fix) ======= 100.0% >>>>>>> 0d6dd12 (Manifest_cache true) ======= 100.0% >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 2 relevant lines. 2 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= module ApplicationHelper <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> c8da2e3 (Fix) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class PaginatingDecorator < Draper::CollectionDecorator >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 872e675 (Fix) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate :current_page, :per_page, :offset, :total_entries, :total_pages >>>>>>> e3e66f3 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    4. end

    app/decorators/review_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= 75.0% >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    4 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 3 lines covered and <<<<<<< HEAD ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 4 relevant lines. 4 lines covered and <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= 4 lines covered and >>>>>>> 872e675 (Fix) ======= 4 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= 4 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD class ReviewDecorator < Draper::Decorator >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 872e675 (Fix) ======= class ReviewDecorator < Draper::Decorator >>>>>>> 0d6dd12 (Manifest_cache true) ======= class ReviewDecorator < Draper::Decorator >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD delegate_all >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= delegate_all >>>>>>> 872e675 (Fix) ======= delegate_all >>>>>>> 0d6dd12 (Manifest_cache true) ======= delegate_all >>>>>>> e3e66f3 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def full_name ======= def date_time >>>>>>> b28889f (Fix) ======= def date_time >>>>>>> 872e675 (Fix) ======= def date_time >>>>>>> 0d6dd12 (Manifest_cache true) ======= def date_time >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. 2 =======
    7. 1 >>>>>>> b28889f (Fix) =======
    8. 1 >>>>>>> 872e675 (Fix) =======
    9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 5b7749a (Fix)
    10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD "#{first_name} #{last_name}" ======= ======= >>>>>>> 5b7749a (Fix) created_at.strftime('%m/%d/%Y') >>>>>>> b28889f (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 872e675 (Fix) ======= created_at.strftime('%m/%d/%Y') >>>>>>> 0d6dd12 (Manifest_cache true) ======= created_at.strftime('%m/%d/%Y') >>>>>>> e3e66f3 (Featire specs)
    11. end
    12. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/book_decorator.rb

    90.0% ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/decorators/user_decorator.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= >>>>>>> 49e8a6c (Rebased) 1 lines missed. ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize
    6. end
    7. end

    app/helpers/application_helper.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
        
    1. 1 require 'image_processing'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :authors >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs)
    3. end
    <<<<<<< HEAD

    app/helpers/application_helper.rb

    =======

    app/decorators/review_decorator.rb

    >>>>>>> c7a726c5 (Rebased)

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
        
      <<<<<<< HEAD
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= delegate_all
    3. =======
    4. 1 class ReviewDecorator < Draper::Decorator ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) module ApplicationHelper >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= module ApplicationHelper >>>>>>> 0d6dd12 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    6. 1 ======= =======
    7. 12 =======
    8. 1 >>>>>>> 49e8a6c (Rebased) =======
    9. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    10. 1 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 49e8a6c (Rebased) ======= def markdown(text) >>>>>>> 0d6dd12 (Manifest_cache true) ======= def markdown(text) >>>>>>> e3e66f3 (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    12. =======
    13. 13 <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
    14. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
    15. 13 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
    16. 13 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    17. 13 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate_all
    18. >>>>>>> c7a726c5 (Rebased)
    19. <<<<<<< HEAD
    20. =======
    21. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD def full_name
    22. <<<<<<< HEAD
    23. 3 ======= <<<<<<< HEAD
    24. 1 =======
    25. 17 >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD "#{first_name} #{last_name}" ======= created_at.strftime('%m/%d/%Y') ======= Markdown.new(text).to_html.html_safe >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= Markdown.new(text).to_html.html_safe >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= Markdown.new(text).to_html.html_safe >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
    7. 1 return if user.shipping.update(params[:shipping])
    8. context.fail!
    9. end
    10. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class ApplicationJob < ActiveJob::Base
    2. # Automatically retry jobs that encountered a deadlock
    3. # retry_on ActiveRecord::Deadlocked
    4. # Most jobs are safe to ignore if the underlying records are no longer available
    5. # discard_on ActiveJob::DeserializationError
    6. end

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed.
        
    1. 1 class CartCleaner < ApplicationJob
    2. # include Sidekiq::Job
    3. 1 queue_as :default
    4. 1 def perform(order_id)
    5. order = Order.find(order_id)
    6. order.destroy if order.status.eql?('initialized')
    7. end
    8. end

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 "#{first_name} #{last_name}" ======= >>>>>>> 67ab5299 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    5. <<<<<<< HEAD =======
    6. >>>>>>> bd8bda4 (Manifest_cache true) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. ======= def date_time >>>>>>> c7a726c5 (Rebased)
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class ======= created_at.strftime('%m/%d/%Y') >>>>>>> c7a726c5 (Rebased)
    7. <<<<<<< HEAD
    8. 31 =======
    9. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD PaginatingDecorator ======= end >>>>>>> c7a726c5 (Rebased)
    10. <<<<<<< HEAD end ======= end

    app/decorators/user_decorator.rb

    100.0% lines covered

    5 relevant lines. 5 lines covered and 0 lines missed.
        
    1. 1 class UserDecorator < Draper::Decorator
    2. 1 delegate_all
    3. 1 def name_or_email
    4. 2 return name if name.present?
    5. 2 email.split('@').first.capitalize >>>>>>> c7a726c5 (Rebased)
    6. <<<<<<< HEAD
    7. 1 delegate_all
    8. 1 def authors_names
    9. 90 authors.map(&:full_name).join(', ')
    10. ======= >>>>>>> c7a726c5 (Rebased) end
    11. <<<<<<< HEAD
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end
    <<<<<<< HEAD
    ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> 0f8241bb (Featire specs)

    app/decorators/category_decorator.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) 3 relevant lines. 3 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD class CategoryDecorator < Draper::Decorator ======= <<<<<<< HEAD <<<<<<< HEAD require 'image_processing' >>>>>>> 0f8241bb (Featire specs)
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. ======= <<<<<<< HEAD
    4. >>>>>>> c7a726c5 (Rebased) end

    app/helpers/application_helper.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) module ApplicationHelper
    2. <<<<<<< HEAD
    3. ======= <<<<<<< HEAD <<<<<<< HEAD
    4. =======
    5. >>>>>>> 824bb2b (Featire specs) =======
    6. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 ======= >>>>>>> 84003439 (Featire specs) def markdown(text) ======= <<<<<<< HEAD <<<<<<< HEAD def markdown(text) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs)
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    8. 12 =======
    9. 1 >>>>>>> 11792758 (Rebased) <<<<<<< HEAD Markdown.new(text).to_html ======= def markdown(text) >>>>>>> 11792758 (Rebased)
    10. =======
    11. 13 >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 0f8241bb (Featire specs)
    12. 13 ======= <<<<<<< HEAD
    13. 12 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
    14. 12 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Markdown.new(text).to_html.html_safe ======= Markdown.new(text).to_html >>>>>>> 824bb2b (Featire specs) ======= Markdown.new(text).to_html >>>>>>> 6da9530 (Featire specs)
    15. <<<<<<< HEAD <<<<<<< HEAD
    16. =======
    17. >>>>>>> 824bb2b (Featire specs) =======
    18. >>>>>>> 6da9530 (Featire specs) end
    19. <<<<<<< HEAD <<<<<<< HEAD
    20. =======
    21. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    22. >>>>>>> 6da9530 (Featire specs) end

    app/helpers/constants.rb

    100.0% lines covered

    21 relevant lines. 21 lines covered and 0 lines missed.
        
    1. 1 module Constants
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) =======
    3. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    4. >>>>>>> 752f0c0 (Featire specs) =======
    5. >>>>>>> 4e81ea2 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
    7. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
    8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) =======
    9. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
    10. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
    11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
    12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    13. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 PAGINATION_PER_PAGE = 12 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= decorates_association :categories >>>>>>> 02a399d (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
    15. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    16. =======
    17. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= =======
    18. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) =======
    19. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
    20. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
    21. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
    22. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= =======
    23. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    24. >>>>>>> 752f0c0 (Featire specs) =======
    25. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    26. >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    28. 1 STAR_MIN = 0
    29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs)
    30. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) STAR_MAX = 5
    31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    32. =======
    33. =======
    34. 30 =======
    35. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    36. 31 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) PaginatingDecorator
    37. end
    38. >>>>>>> 02a399d (Manifest_cache true) =======
    39. >>>>>>> 5b7749a (Fix) =======
    40. >>>>>>> 6da9530 (Featire specs)
    41. 1 CATALOG_BOOK_COUNT = 3
    42. 1 BEST_SELLER_COUNT = 4
    43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= delegate_all
    44. 1 def authors_names
    45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    46. 1 ======= <<<<<<< HEAD
    47. 89 =======
    48. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    49. 90 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) authors.map(&:full_name).join(', ')
    50. end
    51. 1 def categories_names
    52. 1 categories.map(&:name).join(', ')
    53. end
    54. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD ======= <<<<<<< HEAD end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
    2. <<<<<<< HEAD
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) end
    7. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
    8. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> bd8bda4 (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) DESCRIPTION_LENGTH = 25
    3. <<<<<<< HEAD <<<<<<< HEAD
    4. 1 def full_name
    5. 2 "#{first_name} #{last_name}" <<<<<<< HEAD ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end
    7. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    4. 1 MIN_PRICE_IN_CENTS = 0
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD MAX_PRICE_IN_CENTS = 50_000 ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 824bb2b (Featire specs) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 311e9fa (Rebased) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> 0d6dd12 (Manifest_cache true) ======= MAX_PRICE_IN_CENTS = 50_000 >>>>>>> e3e66f3 (Featire specs) ======= MAX_PRICE_IN_CENTS = 10_000 >>>>>>> 6da9530 (Featire specs)
    6. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
    7. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
    8. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
    9. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
    10. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
    11. 1 VALIDATES_NAME_LENGTH_MAX = 50
    12. 1 VALIDATES_TEXT_LENGTH_MAX = 500
    13. 1 VALIDATES_TITLE_LENGTH_MAX = 80
    14. 1 VALIDATES_PHONE_LENGTH_MAX = 15
    15. 1 VALIDATES_ZIP_LENGTH_MAX = 10
    16. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
    17. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
    18. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/interactors/billing_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class BillingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= <<<<<<< HEAD
    8. 30 =======
    9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    10. 31 >>>>>>> 1214e1f (Add login registration pages) =======
    11. >>>>>>> d782a28 (Manifest_cache true) =======
    12. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    13. >>>>>>> e3e66f3 (Featire specs) PaginatingDecorator
    14. end
    15. 1 delegate_all
    16. 1 def authors_names
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    18. 1 ======= <<<<<<< HEAD
    19. 89 =======
    20. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    21. 90 >>>>>>> 1214e1f (Add login registration pages) =======
    22. 1 >>>>>>> d782a28 (Manifest_cache true) =======
    23. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
    24. 1 >>>>>>> e3e66f3 (Featire specs) authors.map(&:full_name).join(', ')
    25. end
    26. 1 def categories_names
    27. 1 categories.map(&:name).join(', ')
    28. end
    29. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs)
    4. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD end
    5. <<<<<<< HEAD <<<<<<< HEAD

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true)
    2. <<<<<<< HEAD <<<<<<< HEAD
    3. ======= <<<<<<< HEAD
    4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    5. =======
    6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
    7. >>>>>>> d782a28 (Manifest_cache true) end
    8. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    9. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 02a399d (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 =======
    5. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}"
    6. end
    7. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors ======= DESCRIPTION_LENGTH = 25 >>>>>>> d782a28 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 0d6dd12 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> e3e66f3 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    4. 1 user = context.current_user
    5. 1 return if params[:billing].nil?
    6. 1 return if user.billing.update(params[:billing])
    7. context.fail!
    8. end
    9. end

    app/interactors/shipping_update.rb

    87.5% lines covered

    8 relevant lines. 7 lines covered and 1 lines missed.
        
    1. 1 class ShippingUpdate
    2. 1 include Interactor
    3. 1 def call
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) params = context.permitted_params
    6. <<<<<<< HEAD <<<<<<< HEAD
    7. PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 1 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> aa7b40c (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
    5. <<<<<<< HEAD end
    6. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. <<<<<<< HEAD <<<<<<< HEAD
    7. 31 PaginatingDecorator
    8. end
    9. 1 delegate_all
    10. 1 def authors_names
    11. 90 authors.map(&:full_name).join(', ')
    12. end
    13. 1 def categories_names
    14. 1 categories.map(&:name).join(', ')
    15. end
    16. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    2. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= delegate_all
    3. 1 def full_name
    4. 3 "#{first_name} #{last_name}"
    5. end
    6. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. 1 user = context.current_user
    5. 1 return if params[:shipping].nil?
    6. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    7. 1 return if user.shipping.update(params[:shipping])
    8. context.fail!
    9. end
    10. end

    app/interactors/user_update.rb

    100.0% lines covered

    13 relevant lines. 13 lines covered and 0 lines missed.
        
    1. 1 class UserUpdate
    2. 1 include Interactor
    3. 1 def call
    4. 5 params = context.permitted_params
    5. 5 user = context.current_user
    6. 5 billing_and_shipping_update(params, user)
    7. 5 return if params[:user].nil?
    8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
    9. 2 return if !params[:user][:password].nil? &&
    10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
    11. 1 context.fail!
    12. end
    13. 1 def billing_and_shipping_update(params, user)
    14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
    15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
    16. end
    17. end
    <<<<<<< HEAD

    app/jobs/application_job.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class ApplicationJob < ActiveJob::Base
    2. # Automatically retry jobs that encountered a deadlock
    3. # retry_on ActiveRecord::Deadlocked
    4. # Most jobs are safe to ignore if the underlying records are no longer available
    5. # discard_on ActiveJob::DeserializationError
    6. end

    app/jobs/cart_cleaner.rb

    60.0% lines covered

    5 relevant lines. 3 lines covered and 2 lines missed.
        
    1. 1 class CartCleaner < ApplicationJob
    2. # include Sidekiq::Job
    3. 1 queue_as :default
    4. 1 def perform(order_id)
    5. order = Order.find(order_id)
    6. order.destroy if order.status.eql?('initialized')
    7. end
    8. end
    ======= >>>>>>> 6da9530 (Featire specs)

    app/models/address.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 class Address < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 validates :first_name, :last_name,
    4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX }, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
    2. <<<<<<< HEAD
    3. =======
    4. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    5. 1 def full_name
    6. 2 =======
    7. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}" ======= >>>>>>> 31d15e66 (Fix) ======= ======= DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= =======

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper ======= >>>>>>> aa7b40c (Manifest_cache true)
    2. 1 <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= delegate_all
    3. 1 def full_name
    4. 2 "#{first_name} #{last_name}" ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD =======
    6. >>>>>>> bd8bda4 (Manifest_cache true) =======
    7. >>>>>>> 4e81ea2 (Featire specs) =======
    8. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    9. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> e5752db (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    3. <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) =======
    7. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    8. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    9. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    10. end

    app/decorators/book_decorator.rb

    100.0% lines covered

    10 relevant lines. 10 lines covered and 0 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> 9bfbd88 (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    11. 1 <<<<<<< HEAD DESCRIPTION_LENGTH = 25 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
    12. <<<<<<< HEAD =======
    13. 31 PaginatingDecorator
    14. end
    15. 1 delegate_all
    16. 1 def authors_names
    17. 90 authors.map(&:full_name).join(', ')
    18. end
    19. 1 def categories_names
    20. 1 categories.map(&:name).join(', ')
    21. end
    22. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end ======= devise :database_authenticatable, >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs)
    3. <<<<<<< HEAD
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    6. >>>>>>> 08edf50 (Featire specs) =======
    7. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    8. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
    9. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
    10. end

    app/decorators/book_decorator.rb

    90.0% lines covered

    10 relevant lines. 9 lines covered and 1 lines missed.
        
    1. 1 class BookDecorator < Draper::Decorator
    2. 1 decorates_association :authors
    3. 1 decorates_association :categories
    4. ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
    5. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def self.collection_decorator_class ======= >>>>>>> 34509eee (Featire specs) def self.collection_decorator_class <<<<<<< HEAD ======= ======= def self.collection_decorator_class
    6. 31 PaginatingDecorator
    7. end
    8. 1 delegate_all
    9. 1 def authors_names
    10. 90 authors.map(&:full_name).join(', ')
    11. end
    12. 1 def categories_names
    13. 1 categories.map(&:name).join(', ')
    14. end
    15. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD =======
    4. 31 PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 90 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/decorators/paginating_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class PaginatingDecorator < Draper::CollectionDecorator
    2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 DESCRIPTION_LENGTH = 25 >>>>>>> 183b6c5 (Manifest_cache true) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 7a02bbe (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
    4. PaginatingDecorator
    5. end
    6. 1 delegate_all
    7. 1 def authors_names
    8. 1 authors.map(&:full_name).join(', ')
    9. end
    10. 1 def categories_names
    11. 1 categories.map(&:name).join(', ')
    12. end
    13. end

    app/decorators/category_decorator.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class CategoryDecorator < Draper::Decorator
    2. 1 delegate_all
    3. end

    app/helpers/application_helper.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 module ApplicationHelper
    2. 1 >>>>>>> aa7b40c (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> 752f0c0 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4e81ea2 (Featire specs) ======= DESCRIPTION_LENGTH = 25 >>>>>>> 08edf50 (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    4. >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) format: { with: Constants::NAME_FORMAT,
    5. message: 'Please enter first or last in correct format' }, allow_blank: true
    6. 1 validates :phone,
    7. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
    8. format: { with: Constants::PHONE_FORMAT,
    9. message: 'Please enter phone in correct format' }, allow_blank: true
    10. 1 validates :address,
    11. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    12. format: { with: Constants::TEXT_FORMAT,
    13. message: 'Please enter address in correct format' }, allow_blank: true
    14. 1 validates :country, :city,
    15. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    16. format: { with: Constants::COUNTY_FORMAT,
    17. message: 'Please enter country in correct format' }, allow_blank: true
    18. 1 validates :zip,
    19. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
    20. format: { with: Constants::ZIP_FORMAT,
    21. message: 'Please enter zip in correct format' }, allow_blank: true
    22. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/admin_user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class AdminUser < ApplicationRecord
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= # Include default devise modules. Others available are: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Include default devise modules. Others available are: >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= # Include default devise modules. Others available are: >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= # Include default devise modules. Others available are: >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    5. =======
    6. >>>>>>> 752f0c0 (Featire specs) =======
    7. >>>>>>> bd8bda4 (Manifest_cache true) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> aa7b40c (Manifest_cache true) =======
    10. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    11. >>>>>>> 0d6dd12 (Manifest_cache true) =======
    12. >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= =======
    13. >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    14. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Include default devise modules. Others available are: ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> 9a49b7b (Rebased) ======= ======= devise :database_authenticatable, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= devise :database_authenticatable, >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= devise :database_authenticatable, >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    16. >>>>>>> 84003439 (Featire specs) :recoverable, :rememberable, :validatable >>>>>>> c7a726c5 (Rebased)
    17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    18. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    19. ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs)
    20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
    21. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
    22. >>>>>>> bd8bda4 (Manifest_cache true) =======
    23. >>>>>>> 4e81ea2 (Featire specs) =======
    24. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    26. >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    27. >>>>>>> 08edf50 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
    28. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    29. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
    30. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    31. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    32. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    33. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    34. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    35. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) =======
    36. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    37. 1 devise :database_authenticatable,
    38. :recoverable, :rememberable, :validatable
    39. ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
    40. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= =======
    41. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= =======
    43. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    44. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
    45. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    46. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
    47. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
    48. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
    49. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
    50. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    51. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

    app/models/application_record.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class ApplicationRecord < ActiveRecord::Base
    2. 1 self.abstract_class = true
    3. end

    app/models/author.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) 4 relevant lines. 4 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 4 relevant lines. 4 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 class Author < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :books, through: :authors_books
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= validates :first_name, :last_name, presence: true ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD
    6. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    8. 1 validates :last_name, presence: true
    9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
    10. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :first_name, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :first_name, :last_name, presence: true >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
    9. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
    10. ======= >>>>>>> 6da9530 (Featire specs)
    11. 1 validates :last_name, presence: true
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
    13. >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= =======
    14. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :first_name, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
    6. ======= <<<<<<< HEAD <<<<<<< HEAD
    7. ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
    8. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
    9. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
    10. 1 validates :last_name, presence: true
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true <<<<<<< HEAD <<<<<<< HEAD ======= validates :first_name, :last_name, presence: true >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs)
    7. 1 validates :last_name, presence: true
    8. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/authors_book.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class AuthorsBook < ApplicationRecord
    2. 1 belongs_to :author
    3. 1 belongs_to :book
    4. 1 validates :author, :book, presence: true ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    5. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/billing.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Billing < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/book.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) 9 relevant lines. 9 lines covered and ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= 9 relevant lines. 9 lines covered and ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 10 relevant lines. 10 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 class Book < ApplicationRecord
    2. 1 has_many :authors_books, dependent: :destroy
    3. 1 has_many :authors, through: :authors_books
    4. 1 has_many :books_categories, dependent: :destroy
    5. 1 has_many :categories, through: :books_categories
    6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :title, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many_attached :images >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= has_many :reviews, dependent: :destroy >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :title, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :title, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= has_many_attached :images >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
    8. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    9. =======
    10. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    11. 1 >>>>>>> 752f0c0 (Featire specs) =======
    12. 1 >>>>>>> 4e81ea2 (Featire specs) =======
    13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    14. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    15. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    17. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    18. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    20. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    22. >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    23. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    24. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    25. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    26. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    27. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    28. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    29. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
    30. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    31. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :description, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= validates :description, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 0d6dd12 (Manifest_cache true) ======= validates :description, presence: true >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    32. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) has_many_attached :images >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= has_many :reviews, dependent: :destroy >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= has_many_attached :images >>>>>>> 11792758 (Rebased)
    33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    34. 1 <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= validates :price_cents, :quantity, presence: true, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    35. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= numericality: >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
    36. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    37. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    38. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
    5. >>>>>>> 75fa7e1b (Rebased)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD
    7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    8. <<<<<<< HEAD
    9. =======
    10. >>>>>>> 824bb2b (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs)
    13. <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs)
    14. <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    15. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    16. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    6. >>>>>>> d0dc1f1 (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD class BooksCategory < ApplicationRecord
    11. 1 belongs_to :category
    12. 1 belongs_to :book
    13. 1 validates :category, :book, presence: true
    14. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    5. >>>>>>> 49e8a6c (Rebased)
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) =======
    12. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) has_many_attached :images ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    14. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 5b7749a (Fix)
    15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
    16. 1 =======
    17. >>>>>>> d0dc1f1 (Featire specs) =======
    18. >>>>>>> 752f0c0 (Featire specs) =======
    19. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    20. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    21. >>>>>>> 7a02bbe (Featire specs) =======
    22. >>>>>>> 4552227 (Featire specs) =======
    23. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    25. numericality:
    26. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, ======= validates :price_cents, :quantity, presence: true, >>>>>>> 5b7749a (Fix)
    27. numericality:
    28. <<<<<<< HEAD =======
    29. >>>>>>> d0dc1f1 (Featire specs) =======
    30. >>>>>>> 752f0c0 (Featire specs) =======
    31. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    32. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    33. >>>>>>> 08edf50 (Featire specs) =======
    34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    35. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    36. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    37. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
    5. >>>>>>> 11792758 (Rebased)
    6. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD
    7. >>>>>>> 311e9fa (Rebased) 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs)
    8. <<<<<<< HEAD
    9. =======
    10. >>>>>>> 824bb2b (Featire specs) =======
    11. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD validates :price_cents, :quantity, presence: true, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :price, :quantity, presence: true, <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs)
    12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
    13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 824bb2b (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, >>>>>>> 6da9530 (Featire specs)
    14. <<<<<<< HEAD <<<<<<< HEAD numericality: ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 824bb2b (Featire specs) ======= less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS } >>>>>>> 6da9530 (Featire specs)
    15. <<<<<<< HEAD <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    16. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    17. ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. =======
    2. >>>>>>> d0dc1f1 (Featire specs) =======
    3. >>>>>>> 752f0c0 (Featire specs) =======
    4. >>>>>>> 4e81ea2 (Featire specs) =======
    5. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    6. >>>>>>> d0dc1f1 (Featire specs) =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) =======
    9. >>>>>>> 08edf50 (Featire specs) =======
    10. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD class BooksCategory < ApplicationRecord
    11. 1 belongs_to :category
    12. 1 belongs_to :book
    13. 1 validates :category, :book, presence: true
    14. ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    5. >>>>>>> 49e8a6c (Rebased)
    6. =======
    7. >>>>>>> d0dc1f1 (Featire specs) =======
    8. >>>>>>> 752f0c0 (Featire specs) =======
    9. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= =======
    10. >>>>>>> 08edf50 (Featire specs) =======
    11. >>>>>>> 7a02bbe (Featire specs) =======
    12. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= has_many_attached :images
    13. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 5b7749a (Fix)
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    15. 1 =======
    16. >>>>>>> d0dc1f1 (Featire specs) =======
    17. >>>>>>> 752f0c0 (Featire specs) =======
    18. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    20. >>>>>>> 7a02bbe (Featire specs) =======
    21. >>>>>>> 4552227 (Featire specs) =======
    22. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) validates :price_cents, :quantity, presence: true, ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
    23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
    24. numericality:
    25. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS, ======= validates :price_cents, :quantity, presence: true, >>>>>>> 5b7749a (Fix)
    26. numericality:
    27. <<<<<<< HEAD =======
    28. >>>>>>> d0dc1f1 (Featire specs) =======
    29. >>>>>>> 752f0c0 (Featire specs) =======
    30. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    31. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    32. >>>>>>> 08edf50 (Featire specs) =======
    33. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
    34. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
    35. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
    36. >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) end

    app/models/books_category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class BooksCategory < ApplicationRecord
    2. 1 belongs_to :category
    3. 1 belongs_to :book
    4. 1 validates :category, :book, presence: true
    5. end

    app/models/category.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Category < ApplicationRecord
    2. 1 has_many :books_categories, dependent: :destroy
    3. 1 has_many :books, through: :books_categories
    4. 1 validates :name, presence: true
    5. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 160fb15 (Fix) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
    >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    =======
    =======
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    =======
    =======
    ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    =======
    =======
    =======

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 26b462d (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)

    app/models/user.rb

    <<<<<<< HEAD =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages)

    app/models/user.rb

    >>>>>>> fdab719f (Fix) ======= ======= =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    >>>>>>> ef483b6d (Fix)

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)

    app/queries/book_query.rb

    85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) ======= 2 relevant lines. 2 lines covered and >>>>>>> fdab719f (Fix) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> ef483b6d (Fix) class User < ApplicationRecord ======= class Coupon < ApplicationRecord >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> ef483b6d (Fix)
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. <<<<<<< HEAD <<<<<<< HEAD =======
    6. >>>>>>> aca90e3 (Rebased) ======= >>>>>>> fdab719f (Fix) ======= =======
    7. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 1 <<<<<<< HEAD devise :database_authenticatable, :registerable, ======= belongs_to :order, optional: true >>>>>>> 5b7749a (Fix)
    8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix)
    9. =======
    10. >>>>>>> aca90e3 (Rebased) =======
    11. >>>>>>> fdab719f (Fix) :recoverable, :rememberable, :validatable,
    12. <<<<<<< HEAD <<<<<<< HEAD
    13. =======
    14. >>>>>>> aca90e3 (Rebased) =======
    15. >>>>>>> fdab719f (Fix) :confirmable, :lockable, :timeoutable, :trackable,
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. =======
    18. >>>>>>> aca90e3 (Rebased) =======
    19. >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased) ======= :omniauthable >>>>>>> fdab719f (Fix)
    20. <<<<<<< HEAD <<<<<<< HEAD
    21. ======= <<<<<<< HEAD
    22. 1 has_one :billing, dependent: :destroy
    23. 1 has_one :shipping, dependent: :destroy
    24. 1 has_many :reviews, dependent: :destroy
    25. 1 def self.from_omniauth(auth)
    26. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    27. user.provider = auth.provider
    28. user.uid = auth.uid
    29. user.name = auth.info.name
    30. user.email = auth.info.email
    31. user.password = Devise.friendly_token[0, 20]
    32. end
    33. end
    34. >>>>>>> aca90e3 (Rebased) =======
    35. >>>>>>> fdab719f (Fix) =======
    36. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
    >>>>>>> 5b7749a (Fix)

    app/models/coupon.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

    app/queries/book_query.rb

    <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5b7749a (Fix) lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 <<<<<<< HEAD class User < ApplicationRecord ======= class Coupon < ApplicationRecord >>>>>>> 5b7749a (Fix)
    2. <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD devise :database_authenticatable, :registerable, ======= belongs_to :order, optional: true >>>>>>> 5b7749a (Fix)
    7. <<<<<<< HEAD
    8. :recoverable, :rememberable, :validatable,
    9. :confirmable, :lockable, :timeoutable, :trackable,
    10. :omniauthable
    11. =======
    12. >>>>>>> 5b7749a (Fix) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages)
    >>>>>>> e1f4d17 (Add login registration pages) =======

    app/models/order.rb

    100.0% lines covered

    4 relevant lines. 4 lines covered and 0 lines missed.
        
    1. 1 class Order < ApplicationRecord
    2. 1 has_many :order_books, dependent: :destroy
    3. 1 has_many :books, through: :order_books
    4. 1 has_one :coupon, dependent: :nullify
    5. end

    app/models/order_book.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 class OrderBook < ApplicationRecord
    2. 1 belongs_to :order
    3. 1 belongs_to :book
    4. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)

    app/models/user.rb

    100.0% lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 85.71% >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)

    app/models/user.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c7a726c5 (Rebased) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= 85.71% <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)

    app/models/user.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/models/review.rb

    100.0% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
    <<<<<<< HEAD =======

    app/models/user.rb

    100.0% ======= >>>>>>> a5d032d (Fix) lines covered

    <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
    >>>>>>> bae2b7de (Add login registration pages)

    app/models/user.rb

    <<<<<<< HEAD 100.0% ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 85.71% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) lines covered

    <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= 7 relevant lines. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> 9440753 (Featire specs) ======= ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= 7 relevant lines. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= 7 relevant lines. <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 7 lines covered and 0 lines missed.
        
    1. 1 class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)

    app/models/user.rb

    53.85% lines covered

    13 relevant lines. 7 lines covered and 6 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. 1 devise :database_authenticatable, :registerable,
    3. :recoverable, :rememberable, :validatable,
    4. :confirmable, :lockable, :timeoutable, :trackable,
    5. :omniauthable, omniauth_providers: [:facebook]
    6. 1 has_one :billing, dependent: :destroy
    7. 1 has_one :shipping, dependent: :destroy
    8. 1 has_one :order, dependent: :destroy
    9. 1 has_many :reviews, dependent: :destroy
    10. 1 def self.from_omniauth(auth)
    11. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    12. user.provider = auth.provider
    13. user.uid = auth.uid
    14. user.name = auth.info.name
    15. user.email = auth.info.email
    16. user.password = Devise.friendly_token[0, 20]
    17. end
    18. end
    19. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 490b01d6 (Manifest_cache true)

    app/models/user.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======

    app/models/review.rb

    >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
        
    1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
    2. 1 belongs_to :user
    3. 1 belongs_to :book
    4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
    5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
    6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
    7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
    8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
    9. 1 validates :rating,
    10. numericality: {
    11. greater_than_or_equal_to: Constants::STAR_MIN,
    12. less_than_or_equal_to: Constants::STAR_MAX
    13. }, presence: true
    14. end

    app/models/shipping.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. 1 class Shipping < Address
    2. end
    ======= >>>>>>> 6da9530 (Featire specs)

    app/models/user.rb

    50.0% lines covered

    12 relevant lines. 6 lines covered and 6 lines missed.
        
    1. 1 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) class User < ApplicationRecord
    2. <<<<<<< HEAD <<<<<<< HEAD
    3. # Include default devise modules. Others available are:
    4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    5. =======
    6. >>>>>>> aca90e3 (Rebased) =======
    7. >>>>>>> 6da9530 (Featire specs) 1 devise :database_authenticatable, :registerable,
    8. <<<<<<< HEAD <<<<<<< HEAD
    9. =======
    10. >>>>>>> aca90e3 (Rebased) =======
    11. >>>>>>> 6da9530 (Featire specs) :recoverable, :rememberable, :validatable,
    12. <<<<<<< HEAD <<<<<<< HEAD
    13. =======
    14. >>>>>>> aca90e3 (Rebased) =======
    15. >>>>>>> 6da9530 (Featire specs) :confirmable, :lockable, :timeoutable, :trackable,
    16. <<<<<<< HEAD <<<<<<< HEAD
    17. =======
    18. >>>>>>> aca90e3 (Rebased) =======
    19. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased) ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> 6da9530 (Featire specs)
    20. <<<<<<< HEAD <<<<<<< HEAD
    21. ======= ======= >>>>>>> 6da9530 (Featire specs)
    22. 1 has_one :billing, dependent: :destroy
    23. 1 has_one :shipping, dependent: :destroy
    24. 1 has_many :reviews, dependent: :destroy
    25. 1 def self.from_omniauth(auth)
    26. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
    27. user.provider = auth.provider
    28. user.uid = auth.uid
    29. user.name = auth.info.name
    30. user.email = auth.info.email
    31. user.password = Devise.friendly_token[0, 20]
    32. end
    33. end
    34. <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 6da9530 (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

    app/queries/book_query.rb

    90.0% =======
    <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages)

    app/models/user.rb

    100.0% >>>>>>> 6da9530 (Featire specs) lines covered

    <<<<<<< HEAD 10 relevant lines. 9 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 class User < ApplicationRecord
    2. # Include default devise modules. Others available are:
    3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
    4. 1 devise :database_authenticatable, :registerable,
    5. :recoverable, :rememberable, :validatable,
    6. :confirmable, :lockable, :timeoutable, :trackable,
    7. :omniauthable
    8. end
    >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
    >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
    >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) =======
    >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    app/queries/book_query.rb

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 90.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 8288136d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> c7a726c5 (Rebased) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 lines missed.
        
    1. 1 class BookQuery
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 0d6dd12 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> e3e66f3 (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 0d6dd12 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c7a726c5 (Rebased) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze ======= ======= >>>>>>> a636fda (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= >>>>>>> c8da2e3 (Fix) ======= 'title DESC'].freeze ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 'title DESC'].freeze >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) 'title DESC'].freeze ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 'title DESC'].freeze ======= >>>>>>> c8da2e3 (Fix) ======= 'title DESC'].freeze ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD 'title DESC'].freeze >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= 'title DESC'].freeze >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) def self.query(params)
    5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs)
    6. =======
    7. >>>>>>> 752f0c0 (Featire specs) =======
    8. >>>>>>> 4e81ea2 (Featire specs) 24 =======
    9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    10. 24 >>>>>>> 08edf50 (Featire specs) =======
    11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
    12. 30 >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
    13. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> 160fb15 (Fix) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    14. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    15. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    16. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    17. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
    18. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    19. 24 <<<<<<< HEAD ======= =======
    20. 25 >>>>>>> 1214e1f (Add login registration pages) =======
    21. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    22. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    23. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    24. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    25. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    26. 30 =======
    27. 30 >>>>>>> 9620751 (Featire specs) ======= =======
    28. 30 >>>>>>> 6da9530 (Featire specs) =======
    29. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    30. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    31. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    32. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    33. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    34. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    35. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    36. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    37. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    38. 24 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    39. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) ======= ======= =======
    40. 25 <<<<<<< HEAD >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    41. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    42. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    43. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    44. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    45. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    46. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
    47. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    48. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    49. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
    50. 30 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    52. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    53. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    54. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    55. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    56. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    57. =======
    58. >>>>>>> 752f0c0 (Featire specs) =======
    59. >>>>>>> 4e81ea2 (Featire specs) =======
    60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    61. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    62. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    63. 12 =======
    64. 12 >>>>>>> 9620751 (Featire specs) =======
    65. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    66. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    67. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    68. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    69. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    70. =======
    71. >>>>>>> 752f0c0 (Featire specs) =======
    72. >>>>>>> 4e81ea2 (Featire specs) =======
    73. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    74. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    75. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    76. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    77. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    78. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    79. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    80. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
    81. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    82. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    83. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    84. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) =======
    85. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    86. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    87. =======
    88. >>>>>>> 752f0c0 (Featire specs) =======
    89. >>>>>>> 4e81ea2 (Featire specs) =======
    90. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    91. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    92. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    93. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    94. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    95. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    96. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    97. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    98. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    99. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    100. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
    101. 12 =======
    102. 7 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) if params[:category].nil?
    103. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    104. 12 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    105. 12 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) =======
    106. 12 ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    107. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
    108. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    109. =======
    110. >>>>>>> 752f0c0 (Featire specs) =======
    111. >>>>>>> 4e81ea2 (Featire specs) =======
    112. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
    113. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    114. 12 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
    115. 12 =======
    116. 12 >>>>>>> 9620751 (Featire specs) =======
    117. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    118. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
    119. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    120. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    122. =======
    123. >>>>>>> 752f0c0 (Featire specs) =======
    124. >>>>>>> 4e81ea2 (Featire specs) =======
    125. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    126. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    127. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    128. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    129. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    130. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    131. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    132. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= =======
    133. 7 <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    134. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs)
    135. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    136. =======
    137. >>>>>>> 752f0c0 (Featire specs) =======
    138. >>>>>>> 4e81ea2 (Featire specs) =======
    139. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= =======
    140. >>>>>>> 0d6dd12 (Manifest_cache true) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    141. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    142. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
    143. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    144. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) =======
    145. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    146. 7 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
    147. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
    148. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
    149. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
    150. 12 =======
    151. 7 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    152. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    153. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    154. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    156. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    157. =======
    158. >>>>>>> 752f0c0 (Featire specs) =======
    159. >>>>>>> 4e81ea2 (Featire specs) =======
    160. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    161. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    162. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    163. =======
    164. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    165. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    166. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    167. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    168. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    169. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    170. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    171. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    172. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    173. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    174. =======
    175. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    178. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    179. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    180. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    181. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    182. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    183. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    184. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    185. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    186. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    187. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    188. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    189. =======
    190. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    191. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    192. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    193. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    194. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    195. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    196. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    197. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    198. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) else
    199. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    200. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    201. =======
    202. >>>>>>> 752f0c0 (Featire specs) =======
    203. >>>>>>> 4e81ea2 (Featire specs) =======
    204. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    205. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    206. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    207. =======
    208. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    209. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    210. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    212. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
    213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    214. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
    215. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= =======
    216. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    217. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    218. =======
    219. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    220. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    221. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    222. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    223. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= =======
    224. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
    225. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
    226. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
    227. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
    228. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
    232. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    233. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    234. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    235. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    236. =======
    237. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    238. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    239. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    240. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    241. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    242. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    243. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    244. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    245. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    246. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    247. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> c7a726c5 (Rebased) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    248. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    249. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    250. =======
    251. >>>>>>> 752f0c0 (Featire specs) =======
    252. >>>>>>> 4e81ea2 (Featire specs) =======
    253. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    254. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    255. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    256. =======
    257. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    258. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    259. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= =======
    261. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    262. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    263. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    264. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    265. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    266. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    267. =======
    268. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    269. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    270. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    271. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    272. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    273. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    274. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    275. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    276. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    277. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
    278. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    279. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    280. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    281. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    282. =======
    283. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    284. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    285. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    286. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    287. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    288. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    289. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    290. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    291. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    292. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    293. 18 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    294. 18 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    295. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    296. =======
    297. >>>>>>> 752f0c0 (Featire specs) =======
    298. >>>>>>> 4e81ea2 (Featire specs) =======
    299. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    300. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs)
    301. 18 ======= <<<<<<< HEAD
    302. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs)
    303. =======
    304. >>>>>>> 752f0c0 (Featire specs) =======
    305. >>>>>>> 4e81ea2 (Featire specs) =======
    306. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    307. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    308. 18 elsif params[:category].nil?
    309. 16 Book.all
    310. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> c033601 (Rebased) ======= =======
    311. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    312. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    313. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    314. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
    315. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
    316. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
    317. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    318. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    319. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    320. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    321. <<<<<<< HEAD
    322. 16 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
    323. 17 <<<<<<< HEAD ======= =======
    324. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    325. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) Book.all
    326. <<<<<<< HEAD
    327. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> c033601 (Rebased) ======= =======
    328. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    329. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    330. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
    331. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
    332. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
    333. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
    334. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
    335. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    336. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    337. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) >>>>>>> 9bfbd88 (Featire specs) elsif params[:category].nil?
    338. <<<<<<< HEAD <<<<<<< HEAD
    339. 16 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    340. 16 ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    341. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
    342. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs)
    343. 17 <<<<<<< HEAD ======= =======
    344. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    345. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= =======
    346. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= =======
    347. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= =======
    348. 2 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
    349. 2 =======
    350. 2 >>>>>>> 9620751 (Featire specs) =======
    351. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
    352. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
    353. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) =======
    354. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    355. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= =======
    356. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
    357. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
    358. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) =======
    359. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD Book.all ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.all ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> bf05825 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> bf05825 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs)
    360. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
    361. >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    362. =======
    363. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    364. >>>>>>> 9c0d812 (Featire specs) =======
    365. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    366. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs)
    367. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    368. =======
    369. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    370. >>>>>>> 9c0d812 (Featire specs) =======
    371. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    372. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs)
    373. =======
    374. >>>>>>> 752f0c0 (Featire specs) =======
    375. >>>>>>> 4e81ea2 (Featire specs) =======
    376. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= =======
    377. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    378. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs)
    379. =======
    380. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    381. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= =======
    382. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    383. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    384. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    385. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    386. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    387. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    388. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    389. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    390. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    391. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    392. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    393. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    394. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) else
    395. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
    396. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages)
    397. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
    398. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs)
    399. =======
    400. >>>>>>> 752f0c0 (Featire specs) =======
    401. >>>>>>> 4e81ea2 (Featire specs) 17 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    402. 17 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    403. 18 >>>>>>> 1214e1f (Add login registration pages) =======
    404. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    405. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
    406. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    407. 18 >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
    408. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= =======
    409. 2 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) =======
    410. 2 >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    411. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
    412. 2 >>>>>>> c033601 (Rebased) ======= >>>>>>> 824bb2b (Featire specs)
    413. 2 ======= ======= >>>>>>> e3e66f3 (Featire specs)
    414. 2 =======
    415. 2 >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    416. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    417. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    418. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    419. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    420. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    421. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    422. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    423. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    424. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= =======
    425. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    426. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    427. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= =======
    428. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= =======
    429. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
    430. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) =======
    431. 2 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs)
    432. 2 ======= ======= >>>>>>> e3e66f3 (Featire specs)
    433. 2 =======
    434. 2 >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    435. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    436. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    437. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    438. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= =======
    439. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
    440. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    441. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
    442. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    443. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= =======
    444. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    445. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    446. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= =======
    447. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
    448. 2 =======
    449. 17 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 31d15e66 (Fix) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
    451. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    452. ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs)
    453. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    454. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    455. >>>>>>> 94841b5 (Featire specs) =======
    456. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    457. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    458. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    459. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    460. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    461. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    462. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    463. >>>>>>> 94841b5 (Featire specs) =======
    464. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    465. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    466. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    467. >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    468. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    469. ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    470. >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    471. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    472. >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    473. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
    474. =======
    475. >>>>>>> 752f0c0 (Featire specs) =======
    476. >>>>>>> 4e81ea2 (Featire specs) =======
    477. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
    478. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    479. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    480. =======
    481. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
    482. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    483. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    484. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    485. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    486. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    487. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    488. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    489. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    490. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    491. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    492. =======
    493. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    494. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    495. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    496. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    497. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    498. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    499. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    500. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    501. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    502. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= =======
    503. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
    504. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= =======
    505. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    506. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    507. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    508. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    509. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    510. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    511. =======
    512. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    513. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    514. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    516. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    517. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    518. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    519. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    520. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    521. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    522. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    523. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
    524. =======
    525. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    526. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    527. =======
    528. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    529. >>>>>>> 94841b5 (Featire specs) =======
    530. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    531. =======
    532. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    533. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
    534. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    535. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    536. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    537. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
    538. =======
    539. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    540. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    541. >>>>>>> e54deeb (Featire specs) =======
    542. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    543. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    544. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    545. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    546. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    547. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    548. =======
    549. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    550. >>>>>>> 9c0d812 (Featire specs) =======
    551. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    552. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    553. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
    554. =======
    555. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    556. >>>>>>> 9c0d812 (Featire specs) =======
    557. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    558. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    559. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    560. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    561. =======
    562. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    563. >>>>>>> 9c0d812 (Featire specs) =======
    564. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    565. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    566. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    567. =======
    568. >>>>>>> 752f0c0 (Featire specs) =======
    569. >>>>>>> 4e81ea2 (Featire specs) =======
    570. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
    571. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    572. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    573. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    574. =======
    575. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    576. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    577. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    578. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    579. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    580. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    581. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    582. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    583. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    584. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    585. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    586. =======
    587. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    588. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    589. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    590. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    591. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    592. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    593. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    594. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    595. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    596. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    597. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    598. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    599. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    600. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    601. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    602. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    603. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    604. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    605. =======
    606. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    609. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    610. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    611. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    612. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    613. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    614. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    615. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    616. ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    617. ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 6cdb2e1 (Featire specs)
    618. =======
    619. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    620. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    621. =======
    622. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    623. >>>>>>> 94841b5 (Featire specs) =======
    624. ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
    625. =======
    626. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
    627. >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
    628. >>>>>>> b904d7ae (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
    629. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
    630. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price)
    631. ======= >>>>>>> f7852d17 (Manifest_cache true) =======
    632. =======
    633. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
    634. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
    635. >>>>>>> e54deeb (Featire specs) =======
    636. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    637. >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
    638. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    639. >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    640. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    641. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    642. =======
    643. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    644. >>>>>>> 9c0d812 (Featire specs) =======
    645. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    646. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
    647. ======= ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs)
    648. =======
    649. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    650. >>>>>>> 9c0d812 (Featire specs) =======
    651. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
    652. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
    653. ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs)
    654. ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
    655. =======
    656. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
    657. >>>>>>> 9c0d812 (Featire specs) =======
    658. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) =======
    659. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
    660. ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    661. =======
    662. >>>>>>> 752f0c0 (Featire specs) =======
    663. >>>>>>> 4e81ea2 (Featire specs) =======
    664. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
    665. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
    666. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
    667. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    668. =======
    669. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
    670. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
    671. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    672. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    673. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    674. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
    675. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    676. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    677. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= =======
    678. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    679. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    680. =======
    681. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    682. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    683. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    684. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    685. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
    686. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    687. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
    688. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
    689. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    690. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> adc21e0 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    691. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    692. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    693. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
    694. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) =======
    695. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    696. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= =======
    697. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
    698. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
    699. =======
    700. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    701. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    702. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
    703. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    704. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
    705. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
    706. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
    707. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
    708. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======

    app/services/book_service.rb

    88.89% lines covered

    9 relevant lines. 8 lines covered and 1 lines missed.
        
    1. 1 class BookService
    2. 1 def self.quantity_update(params, product, order, book, coupon)
    3. 2 discount = 0
    4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
    5. 2 discount = coupon.discount unless coupon.nil?
    6. 2 if product.save
    7. {
    8. 2 total_price: order.decorate.order_price(discount).to_s,
    9. sub_price: order.decorate.order_price.to_s,
    10. price: product.decorate.total_price.to_s,
    11. 2 discount: (order.decorate.order_price * discount).to_s,
    12. book_quantity: book.quantity
    13. }
    14. else
    15. { notice: 'Error!' }
    16. end
    17. end
    18. end

    app/services/coupon_service.rb

    100.0% lines covered

    8 relevant lines. 8 lines covered and 0 lines missed.
        
    1. 1 class CouponService
    2. 1 def self.find_coupon(params, order, coupon)
    3. 4 error_message = I18n.t('order.coupon.error')
    4. 4 if coupon.nil?
    5. 1 error_message = ' ' if params[:code].eql?('')
    6. {
    7. 1 error: error_message,
    8. total_price: order.decorate.order_price.to_s
    9. }
    10. else
    11. {
    12. 3 total_price: order.decorate.order_price(coupon.discount).to_s,
    13. 3 discount: (order.decorate.order_price * coupon.discount).to_s
    14. }
    15. end
    16. end
    17. end
    >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/application.rb

    100.0% lines covered

    6 relevant lines. 6 lines covered and 0 lines missed.
        
    1. 1 require_relative 'boot'
    2. 1 require 'rails/all'
    3. # Require the gems listed in Gemfile, including any gems
    4. # you've limited to :test, :development, or :production.
    5. 1 Bundler.require(*Rails.groups)
    6. 1 module BookStore
    7. 1 class Application < Rails::Application
    8. # Initialize configuration defaults for originally generated Rails version.
    9. 1 config.load_defaults 6.1
    10. # Configuration for the application, engines, and railties goes here.
    11. #
    12. # These settings can be overridden in specific environments using the files
    13. # in config/environments, which are processed later.
    14. #
    15. # config.time_zone = "Central Time (US & Canada)"
    16. # config.eager_load_paths << Rails.root.join("extras")
    17. end
    18. end

    config/boot.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
    2. 1 require 'bundler/setup' # Set up gems listed in the Gemfile.
    3. 1 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

    config/environment.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Load the Rails application.
    2. 1 require_relative 'application'
    3. # Initialize the Rails application.
    4. 1 Rails.application.initialize!

    config/environments/test.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) 19 relevant lines. 19 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 19 relevant lines. 19 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 require 'active_support/core_ext/integer/time'
    2. # The test environment is used exclusively to run your application's
    3. # test suite. You never need to work with it otherwise. Remember that
    4. # your test database is "scratch space" for the test suite and is wiped
    5. # and recreated between test runs. Don't rely on the data there!
    6. 1 Rails.application.configure do
    7. # Settings specified here will take precedence over those in config/application.rb.
    8. 1 config.cache_classes = false
    9. 1 config.action_view.cache_template_loading = true
    10. # Do not eager load code on boot. This avoids loading your whole application
    11. # just for the purpose of running a single test. If you are using a tool that
    12. # preloads Rails for running tests, you may have to set it to true.
    13. 1 config.eager_load = false
    14. # Configure public file server for tests with Cache-Control for performance.
    15. 1 config.public_file_server.enabled = true
    16. 1 config.public_file_server.headers = {
    17. 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
    18. }
    19. # Show full error reports and disable caching.
    20. 1 config.consider_all_requests_local = true
    21. 1 config.action_controller.perform_caching = false
    22. 1 config.cache_store = :null_store
    23. # Raise exceptions instead of rendering exception templates.
    24. 1 config.action_dispatch.show_exceptions = false
    25. # Disable request forgery protection in test environment.
    26. 1 config.action_controller.allow_forgery_protection = false
    27. # Store uploaded files on the local file system in a temporary directory.
    28. 1 config.active_storage.service = :test
    29. 1 config.action_mailer.perform_caching = false
    30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
    31. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    32. 1 =======
    33. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    34. >>>>>>> 752f0c0 (Featire specs) =======
    35. >>>>>>> 4e81ea2 (Featire specs) =======
    36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
    37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
    38. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    39. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    40. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
    43. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    44. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
    45. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= =======
    46. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
    47. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
    48. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    50. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
    51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    52. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
    53. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    54. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    55. # Tell Action Mailer not to deliver emails to the real world.
    56. # The :test delivery method accumulates sent emails in the
    57. # ActionMailer::Base.deliveries array.
    58. 1 config.action_mailer.delivery_method = :test
    59. # Print deprecation notices to the stderr.
    60. 1 config.active_support.deprecation = :stderr
    61. # Raise exceptions for disallowed deprecations.
    62. 1 config.active_support.disallowed_deprecation = :raise
    63. # Tell Active Support which deprecation messages to disallow.
    64. 1 config.active_support.disallowed_deprecation_warnings = []
    65. # Raises error for missing translations.
    66. # config.i18n.raise_on_missing_translations = true
    67. # Annotate rendered view with file names.
    68. # config.action_view.annotate_rendered_view_with_filenames = true
    69. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/active_admin.rb

    100.0% lines covered

    11 relevant lines. 11 lines covered and 0 lines missed.
        
    1. 1 ActiveAdmin.setup do |config|
    2. 1 config.site_title = 'Book Store'
    3. 1 config.authentication_method = :authenticate_admin_user!
    4. 1 config.current_user_method = :current_admin_user
    5. 1 config.logout_link_path = :destroy_admin_user_session_path
    6. 1 config.batch_actions = true
    7. 1 config.filter_attributes = %i[encrypted_password password password_confirmation]
    8. 1 config.localize_format = :long
    9. 1 config.default_per_page = 30
    10. 1 config.max_per_page = 10_000
    11. 1 config.use_webpacker = true
    12. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/application_controller_renderer.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # ActiveSupport::Reloader.to_prepare do
    3. # ApplicationController.renderer.defaults.merge!(
    4. # http_host: 'example.org',
    5. # https: false
    6. # )
    7. # end

    config/initializers/assets.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Version of your assets, change this if you want to expire all your assets.
    3. 1 Rails.application.config.assets.version = '1.0'
    4. # Add additional assets to the asset load path.
    5. # Rails.application.config.assets.paths << Emoji.images_path
    6. # Add Yarn node_modules folder to the asset load path.
    7. 1 Rails.application.config.assets.paths << Rails.root.join('node_modules')
    8. # Precompile additional assets.
    9. # application.js, application.css, and all non-JS/CSS in the app/assets
    10. # folder are already added.
    11. # Rails.application.config.assets.precompile += %w( admin.js admin.css )

    config/initializers/backtrace_silencers.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
    3. # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
    4. # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
    5. # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
    6. 1 Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']

    config/initializers/content_security_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Define an application-wide content security policy
    3. # For further information see the following documentation
    4. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
    5. # Rails.application.config.content_security_policy do |policy|
    6. # policy.default_src :self, :https
    7. # policy.font_src :self, :https, :data
    8. # policy.img_src :self, :https, :data
    9. # policy.object_src :none
    10. # policy.script_src :self, :https
    11. # policy.style_src :self, :https
    12. # # If you are using webpack-dev-server then specify webpack-dev-server host
    13. # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
    14. # # Specify URI for violation reports
    15. # # policy.report_uri "/csp-violation-report-endpoint"
    16. # end
    17. # If you are using UJS then enable automatic nonce generation
    18. # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
    19. # Set the nonce only to specific directives
    20. # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
    21. # Report CSP violations to a specified URI
    22. # For further information see the following documentation:
    23. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
    24. # Rails.application.config.content_security_policy_report_only = true

    config/initializers/cookies_serializer.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Specify a serializer for the signed and encrypted cookie jars.
    3. # Valid options are :json, :marshal, and :hybrid.
    4. 1 Rails.application.config.action_dispatch.cookies_serializer = :json
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/devise.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 14 relevant lines. 14 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. # frozen_string_literal: true
    2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
    3. 1 =======
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    5. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e60833c (Add login registration pages) =======
    6. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) =======
    7. 1 >>>>>>> aa3618b (Rebased) =======
    8. 1 >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) =======
    10. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    11. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= =======
    12. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) =======
    13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    14. 1 >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= =======
    15. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    16. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= =======
    17. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= Devise.setup do |config| >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= Devise.setup do |config| >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages)
    19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    20. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 7a08014b (Featire specs)
    21. 1 ======= ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages)
    22. 1 =======
    23. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    24. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    25. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    26. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    27. 1 >>>>>>> 5b7749a (Fix) =======
    28. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    29. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
    30. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    31. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    32. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    33. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' <<<<<<< HEAD <<<<<<< HEAD ======= # is set to its default value. Note that some are commented out while others <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    34. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    35. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    36. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    37. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    38. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    39. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    40. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    41. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    42. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) require 'devise/orm/active_record' <<<<<<< HEAD <<<<<<< HEAD ======= # are not: uncommented lines are intended to protect your configuration from <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    43. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    44. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    45. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    46. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    47. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    48. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    49. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    50. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    51. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.case_insensitive_keys = [:email] <<<<<<< HEAD <<<<<<< HEAD ======= # breaking changes in upgrades (i.e., in the event that future versions of <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    52. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    53. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    54. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    55. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    56. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    57. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    58. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    59. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    60. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.strip_whitespace_keys = [:email] <<<<<<< HEAD <<<<<<< HEAD ======= # Devise change the default values for those options). <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise change the default values for those options). >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    61. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    62. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    63. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    64. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    65. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    66. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    67. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    68. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    69. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.skip_session_storage = [:http_auth] <<<<<<< HEAD <<<<<<< HEAD ======= # <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    70. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    71. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    72. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    73. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    74. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    75. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    76. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    77. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    78. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.stretches = Rails.env.test? ? 1 : 12 <<<<<<< HEAD <<<<<<< HEAD ======= # Use this hook to configure devise mailer, warden hooks and so forth. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    79. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    80. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    81. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    82. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    83. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    84. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    85. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    86. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    87. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.reconfirmable = true <<<<<<< HEAD <<<<<<< HEAD ======= # Many of these configuration options can be set straight in your model. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
    89. >>>>>>> 9a49b7b (Rebased) >>>>>>> 89d7dcd2 (Manifest_cache true) =======
    90. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= 1 >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= Devise.setup do |config| >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
    92. 1 =======
    93. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    94. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    95. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    96. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    97. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    98. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    99. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    100. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) =======
    101. 1 >>>>>>> 5b7749a (Fix) =======
    102. 1 >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.password_length = 6..128 <<<<<<< HEAD <<<<<<< HEAD ======= # The secret key used by Devise. Devise uses this key to generate <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    103. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    104. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    105. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    106. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    107. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    108. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    109. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    110. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    111. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ <<<<<<< HEAD <<<<<<< HEAD ======= # random tokens. Changing this key will render invalid all existing <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    112. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    113. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    114. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    115. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    116. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    117. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    118. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    119. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    120. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.reset_password_within = 6.hours <<<<<<< HEAD <<<<<<< HEAD ======= # confirmation, reset password and unlock tokens in the database. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    121. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    122. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    123. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    124. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    125. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    126. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    127. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    128. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    129. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.sign_out_via = :delete <<<<<<< HEAD <<<<<<< HEAD ======= # Devise will use the `secret_key_base` as its `secret_key` <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    130. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix)
    131. 1 <<<<<<< HEAD <<<<<<< HEAD =======
    132. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    133. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    134. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    135. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) =======
    136. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
    137. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= =======
    138. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) config.omniauth :facebook, <<<<<<< HEAD <<<<<<< HEAD ======= # by default. You can change it below and use your own secret key. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    139. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), <<<<<<< HEAD <<<<<<< HEAD ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    140. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    141. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) scope: 'email', info_fields: 'email,name' <<<<<<< HEAD <<<<<<< HEAD ======= # ==> Controller configuration <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) # Configure the parent class to the devise controllers.
    143. # config.parent_controller = 'DeviseController'
    144. # ==> Mailer Configuration
    145. # Configure the e-mail address which will be shown in Devise::Mailer,
    146. # note that it will be overwritten if you use your own mailer class
    147. # with default "from" parameter.
    148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    149. >>>>>>> 9a49b7b (Rebased) >>>>>>> 6066f925 (Add login registration pages) 1 =======
    150. >>>>>>> 1214e1f (Add login registration pages) =======
    151. >>>>>>> 730a8ca (Add login registration pages) =======
    152. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
    153. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    154. >>>>>>> 730a8ca (Add login registration pages) =======
    155. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= =======
    156. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased)
    157. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    158. # Configure the class responsible to send e-mails.
    159. # config.mailer = 'Devise::Mailer'
    160. # Configure the parent class responsible to send e-mails.
    161. # config.parent_mailer = 'ActionMailer::Base'
    162. # ==> ORM configuration
    163. # Load and configure the ORM. Supports :active_record (default) and
    164. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    165. # available as additional gems.
    166. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    167. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    168. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    169. >>>>>>> 730a8ca (Add login registration pages) =======
    170. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    171. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased)
    172. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    173. # ==> Configuration for any authentication mechanism
    174. # Configure which keys are used when authenticating a user. The default is
    175. # just :email. You can configure it to use [:username, :subdomain], so for
    176. # authenticating a user, both parameters are required. Remember that those
    177. # parameters are used only when authenticating and not when retrieving from
    178. # session. If you need permissions, you should implement that in a before filter.
    179. # You can also supply a hash where the value is a boolean determining whether
    180. # or not authentication should be aborted when the value is not present.
    181. # config.authentication_keys = [:email]
    182. # Configure parameters from the request object used for authentication. Each entry
    183. # given should be a request method and it will automatically be passed to the
    184. # find_for_authentication method and considered in your model lookup. For instance,
    185. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    186. # The same considerations mentioned for authentication_keys also apply to request_keys.
    187. # config.request_keys = []
    188. # Configure which authentication keys should be case-insensitive.
    189. # These keys will be downcased upon creating or modifying a user and when used
    190. # to authenticate or find a user. Default is :email.
    191. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    192. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    193. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    194. >>>>>>> 730a8ca (Add login registration pages) =======
    195. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    196. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    197. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    198. # Configure which authentication keys should have whitespace stripped.
    199. # These keys will have whitespace before and after removed upon creating or
    200. # modifying a user and when used to authenticate or find a user. Default is :email.
    201. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    202. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    203. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    204. >>>>>>> 730a8ca (Add login registration pages) =======
    205. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    206. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased)
    207. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    208. # Tell if authentication through request.params is enabled. True by default.
    209. # It can be set to an array that will enable params authentication only for the
    210. # given strategies, for example, `config.params_authenticatable = [:database]` will
    211. # enable it only for database (email + password) authentication.
    212. # config.params_authenticatable = true
    213. # Tell if authentication through HTTP Auth is enabled. False by default.
    214. # It can be set to an array that will enable http authentication only for the
    215. # given strategies, for example, `config.http_authenticatable = [:database]` will
    216. # enable it only for database authentication.
    217. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    218. # enable this with :database unless you are using a custom strategy.
    219. # The supported strategies are:
    220. # :database = Support basic authentication with authentication key + password
    221. # config.http_authenticatable = false
    222. # If 401 status code should be returned for AJAX requests. True by default.
    223. # config.http_authenticatable_on_xhr = true
    224. # The realm used in Http Basic Authentication. 'Application' by default.
    225. # config.http_authentication_realm = 'Application'
    226. # It will change confirmation, password recovery and other workflows
    227. # to behave the same regardless if the e-mail provided was right or wrong.
    228. # Does not affect registerable.
    229. # config.paranoid = true
    230. # By default Devise will store the user in session. You can skip storage for
    231. # particular strategies by setting this option.
    232. # Notice that if you are skipping storage for all authentication paths, you
    233. # may want to disable generating routes to Devise's sessions controller by
    234. # passing skip: :sessions to `devise_for` in your config/routes.rb
    235. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    236. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    237. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    238. >>>>>>> 730a8ca (Add login registration pages) =======
    239. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    240. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased)
    241. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    242. # By default, Devise cleans up the CSRF token on authentication to
    243. # avoid CSRF token fixation attacks. This means that, when using AJAX
    244. # requests for sign in and sign up, you need to get a new CSRF token
    245. # from the server. You can disable this option at your own risk.
    246. # config.clean_up_csrf_token_on_authentication = true
    247. # When false, Devise will not attempt to reload routes on eager load.
    248. # This can reduce the time taken to boot the app but if your application
    249. # requires the Devise mappings to be loaded during boot time the application
    250. # won't boot properly.
    251. # config.reload_routes = true
    252. # ==> Configuration for :database_authenticatable
    253. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    254. # using other algorithms, it sets how many times you want the password to be hashed.
    255. # The number of stretches used for generating the hashed password are stored
    256. # with the hashed password. This allows you to change the stretches without
    257. # invalidating existing passwords.
    258. #
    259. # Limiting the stretches to just one in testing will increase the performance of
    260. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    261. # a value less than 10 in other environments. Note that, for bcrypt (the default
    262. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    263. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    264. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    265. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    266. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    267. >>>>>>> 730a8ca (Add login registration pages) =======
    268. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    269. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased)
    270. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    271. # Set up a pepper to generate the hashed password.
    272. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    273. # Send a notification to the original email when the user's email is changed.
    274. # config.send_email_changed_notification = false
    275. # Send a notification email when the user's password is changed.
    276. # config.send_password_change_notification = false
    277. # ==> Configuration for :confirmable
    278. # A period that the user is allowed to access the website even without
    279. # confirming their account. For instance, if set to 2.days, the user will be
    280. # able to access the website for two days without confirming their account,
    281. # access will be blocked just in the third day.
    282. # You can also set it to nil, which will allow the user to access the website
    283. # without confirming their account.
    284. # Default is 0.days, meaning the user cannot access the website without
    285. # confirming their account.
    286. # config.allow_unconfirmed_access_for = 2.days
    287. # A period that the user is allowed to confirm their account before their
    288. # token becomes invalid. For example, if set to 3.days, the user can confirm
    289. # their account within 3 days after the mail was sent, but on the fourth day
    290. # their account can't be confirmed with the token any more.
    291. # Default is nil, meaning there is no restriction on how long a user can take
    292. # before confirming their account.
    293. # config.confirm_within = 3.days
    294. # If true, requires any email changes to be confirmed (exactly the same way as
    295. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    296. # db field (see migrations). Until confirmed, new email is stored in
    297. # unconfirmed_email column, and copied to email column on successful confirmation.
    298. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    299. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    300. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    301. >>>>>>> 730a8ca (Add login registration pages) =======
    302. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    303. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased)
    304. # Defines which key will be used when confirming an account
    305. # config.confirmation_keys = [:email]
    306. # ==> Configuration for :rememberable
    307. # The time the user will be remembered without asking for credentials again.
    308. # config.remember_for = 2.weeks
    309. # Invalidates all the remember me tokens when the user signs out.
    310. 1 ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
    311. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    312. # If true, extends the user's remember period when remembered via cookie.
    313. # config.extend_remember_period = false
    314. # Options to be passed to the created cookie. For instance, you can set
    315. # secure: true in order to force SSL only cookies.
    316. # config.rememberable_options = {}
    317. # ==> Configuration for :validatable
    318. # Range for password length.
    319. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    320. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    321. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    322. >>>>>>> 730a8ca (Add login registration pages) =======
    323. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    324. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased)
    325. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    326. # Email regex used to validate email formats. It simply asserts that
    327. # one (and only one) @ exists in the given string. This is mainly
    328. # to give user feedback and not to assert the e-mail validity.
    329. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    330. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    331. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    332. >>>>>>> 730a8ca (Add login registration pages) =======
    333. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    334. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased)
    335. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    336. # ==> Configuration for :timeoutable
    337. # The time you want to timeout the user session without activity. After this
    338. # time the user will be asked for credentials again. Default is 30 minutes.
    339. # config.timeout_in = 30.minutes
    340. # ==> Configuration for :lockable
    341. # Defines which strategy will be used to lock an account.
    342. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    343. # :none = No lock strategy. You should handle locking by yourself.
    344. # config.lock_strategy = :failed_attempts
    345. # Defines which key will be used when locking and unlocking an account
    346. # config.unlock_keys = [:email]
    347. # Defines which strategy will be used to unlock an account.
    348. # :email = Sends an unlock link to the user email
    349. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    350. # :both = Enables both strategies
    351. # :none = No unlock strategy. You should handle unlocking by yourself.
    352. # config.unlock_strategy = :both
    353. # Number of authentication tries before locking an account if lock_strategy
    354. # is failed attempts.
    355. # config.maximum_attempts = 20
    356. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    357. # config.unlock_in = 1.hour
    358. # Warn on the last attempt before the account is locked.
    359. # config.last_attempt_warning = true
    360. # ==> Configuration for :recoverable
    361. #
    362. # Defines which key will be used when recovering the password for an account
    363. # config.reset_password_keys = [:email]
    364. # Time interval you can reset your password with a reset password key.
    365. # Don't put a too small interval or your users won't have the time to
    366. # change their passwords.
    367. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    368. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    369. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    370. >>>>>>> 730a8ca (Add login registration pages) =======
    371. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    372. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased)
    373. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    374. # When set to false, does not sign a user in automatically after their password is
    375. # reset. Defaults to true, so a user is signed in automatically after a reset.
    376. # config.sign_in_after_reset_password = true
    377. # ==> Configuration for :encryptable
    378. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    379. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    380. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    381. # for default behavior) and :restful_authentication_sha1 (then you should set
    382. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    383. #
    384. # Require the `devise-encryptable` gem when using anything other than bcrypt
    385. # config.encryptor = :sha512
    386. # ==> Scopes configuration
    387. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    388. # "users/sessions/new". It's turned off by default because it's slower if you
    389. # are using only default views.
    390. # config.scoped_views = false
    391. # Configure the default scope given to Warden. By default it's the first
    392. # devise role declared in your routes (usually :user).
    393. # config.default_scope = :user
    394. # Set this configuration to false if you want /users/sign_out to sign out
    395. # only the current scope. By default, Devise signs out all scopes.
    396. # config.sign_out_all_scopes = true
    397. # ==> Navigation configuration
    398. # Lists the formats that should be treated as navigational. Formats like
    399. # :html, should redirect to the sign in page when the user does not have
    400. # access, but formats like :xml or :json, should return 401.
    401. #
    402. # If you have any extra navigational formats, like :iphone or :mobile, you
    403. # should add them to the navigational formats lists.
    404. #
    405. # The "*/*" below is required to match Internet Explorer requests.
    406. # config.navigational_formats = ['*/*', :html]
    407. # The default HTTP method used to sign out a resource. Default is :delete.
    408. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    409. >>>>>>> 6066f925 (Add login registration pages) 1 =======
    410. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    411. >>>>>>> 730a8ca (Add login registration pages) =======
    412. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
    413. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased)
    414. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    415. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 29e1af94 (Add login registration pages)
    416. 1 =======
    417. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= =======
    418. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= =======
    419. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) =======
    420. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    421. >>>>>>> 730a8ca (Add login registration pages) =======
    422. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= =======
    423. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    424. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # ==> OmniAuth ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    425. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    426. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # up on your models and hooks. ======= ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e989024d (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased)
    427. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    428. # ==> Warden configuration
    429. # If you want to use other strategies, that are not supported by Devise, or
    430. # change the failure app, you can configure them inside the config.warden block.
    431. #
    432. # config.warden do |manager|
    433. # manager.intercept_401 = false
    434. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    435. # end
    436. # ==> Mountable engine configurations
    437. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    438. # is mountable, there are some extra configurations to be taken into account.
    439. # The following options are available, assuming the engine is mounted as:
    440. #
    441. # mount MyEngine, at: '/my_engine'
    442. #
    443. # The router that invoked `devise_for`, in the example above, would be:
    444. # config.router_name = :my_engine
    445. #
    446. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    447. # so you need to do it manually. For the users scope, it would be:
    448. # config.omniauth_path_prefix = '/my_engine/users/auth'
    449. # ==> Turbolinks configuration
    450. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    451. #
    452. # ActiveSupport.on_load(:devise_failure_app) do
    453. # include Turbolinks::Controller
    454. # end
    455. # ==> Configuration for :registerable
    456. # When set to false, does not sign a user in automatically after their password is
    457. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    458. # config.sign_in_after_change_password = true
    459. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) # Configure the parent class to the devise controllers.
    460. # config.parent_controller = 'DeviseController'
    461. # ==> Mailer Configuration
    462. # Configure the e-mail address which will be shown in Devise::Mailer,
    463. # note that it will be overwritten if you use your own mailer class
    464. # with default "from" parameter.
    465. <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    466. >>>>>>> c7a726c5 (Rebased) 1 =======
    467. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    468. >>>>>>> 730a8ca (Add login registration pages) =======
    469. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
    470. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) =======
    471. >>>>>>> 730a8ca (Add login registration pages) =======
    472. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    473. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 730a8ca (Add login registration pages) ======= # is set to its default value. Note that some are commented out while others >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    474. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    475. 1 =======
    476. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    477. >>>>>>> 730a8ca (Add login registration pages) =======
    478. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    479. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    480. >>>>>>> 730a8ca (Add login registration pages) =======
    481. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    482. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= require 'devise/orm/active_record' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 730a8ca (Add login registration pages) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= require 'devise/orm/active_record' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    483. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    484. 1 =======
    485. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    486. >>>>>>> 730a8ca (Add login registration pages) =======
    487. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    488. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    489. >>>>>>> 730a8ca (Add login registration pages) =======
    490. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    491. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.case_insensitive_keys = [:email] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 730a8ca (Add login registration pages) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.case_insensitive_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    492. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    493. 1 =======
    494. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    495. >>>>>>> 730a8ca (Add login registration pages) =======
    496. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    497. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    498. >>>>>>> 730a8ca (Add login registration pages) =======
    499. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    500. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.strip_whitespace_keys = [:email] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> 730a8ca (Add login registration pages) ======= # Devise change the default values for those options). >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.strip_whitespace_keys = [:email] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    501. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    502. 1 =======
    503. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    504. >>>>>>> 730a8ca (Add login registration pages) =======
    505. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    506. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    507. >>>>>>> 730a8ca (Add login registration pages) =======
    508. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    509. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.skip_session_storage = [:http_auth] >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.skip_session_storage = [:http_auth] ======= # >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages) ======= # >>>>>>> 730a8ca (Add login registration pages) ======= # >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.skip_session_storage = [:http_auth] >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    510. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    511. 1 =======
    512. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    513. >>>>>>> 730a8ca (Add login registration pages) =======
    514. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    515. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    516. >>>>>>> 730a8ca (Add login registration pages) =======
    517. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    518. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 730a8ca (Add login registration pages) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.stretches = Rails.env.test? ? 1 : 12 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    519. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    520. 1 =======
    521. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    522. >>>>>>> 730a8ca (Add login registration pages) =======
    523. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    524. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    525. >>>>>>> 730a8ca (Add login registration pages) =======
    526. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    527. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reconfirmable = true >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 730a8ca (Add login registration pages) ======= # Many of these configuration options can be set straight in your model. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.reconfirmable = true >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    528. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true <<<<<<< HEAD <<<<<<< HEAD ======= Devise.setup do |config| >>>>>>> 9bfbd88 (Featire specs) ======= Devise.setup do |config| <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages) ======= Devise.setup do |config| >>>>>>> 730a8ca (Add login registration pages) ======= Devise.setup do |config| >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.expire_all_remember_me_on_sign_out = true >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    529. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    530. 1 =======
    531. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    532. >>>>>>> 730a8ca (Add login registration pages) =======
    533. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    534. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    535. >>>>>>> 730a8ca (Add login registration pages) =======
    536. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    537. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.password_length = 6..128 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 730a8ca (Add login registration pages) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.password_length = 6..128 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    539. 1 =======
    540. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    541. >>>>>>> 730a8ca (Add login registration pages) =======
    542. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    543. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    544. >>>>>>> 730a8ca (Add login registration pages) =======
    545. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    546. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 730a8ca (Add login registration pages) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    547. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    548. 1 =======
    549. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    550. >>>>>>> 730a8ca (Add login registration pages) =======
    551. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    552. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    553. >>>>>>> 730a8ca (Add login registration pages) =======
    554. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    555. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.reset_password_within = 6.hours >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 730a8ca (Add login registration pages) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.reset_password_within = 6.hours >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    556. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    557. 1 =======
    558. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    559. >>>>>>> 730a8ca (Add login registration pages) =======
    560. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    561. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    562. >>>>>>> 730a8ca (Add login registration pages) =======
    563. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    564. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.sign_out_via = :delete >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 730a8ca (Add login registration pages) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.sign_out_via = :delete >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    565. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages)
    566. 1 =======
    567. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    568. >>>>>>> 730a8ca (Add login registration pages) =======
    569. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) =======
    570. 1 >>>>>>> 11792758 (Rebased) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
    571. >>>>>>> 730a8ca (Add login registration pages) =======
    572. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= =======
    573. 1 >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= config.omniauth :facebook, >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> 730a8ca (Add login registration pages) ======= # by default. You can change it below and use your own secret key. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= config.omniauth :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    574. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 730a8ca (Add login registration pages) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    575. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    576. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) ======= # ==> Controller configuration >>>>>>> 730a8ca (Add login registration pages) ======= # ==> Controller configuration >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= scope: 'email', info_fields: 'email,name' >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
    577. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) # Configure the parent class to the devise controllers.
    578. # config.parent_controller = 'DeviseController'
    579. # ==> Mailer Configuration
    580. # Configure the e-mail address which will be shown in Devise::Mailer,
    581. # note that it will be overwritten if you use your own mailer class
    582. # with default "from" parameter.
    583. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 156ffe6 (Add login registration pages)
    584. >>>>>>> 9a49b7b (Rebased) >>>>>>> bae2b7de (Add login registration pages) 1 =======
    585. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> 1214e1f (Add login registration pages)
    586. <<<<<<< HEAD
    587. # Configure the class responsible to send e-mails.
    588. # config.mailer = 'Devise::Mailer'
    589. # Configure the parent class responsible to send e-mails.
    590. # config.parent_mailer = 'ActionMailer::Base'
    591. # ==> ORM configuration
    592. # Load and configure the ORM. Supports :active_record (default) and
    593. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    594. # available as additional gems.
    595. ======= <<<<<<< HEAD
    596. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    597. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 1214e1f (Add login registration pages)
    598. <<<<<<< HEAD
    599. # ==> Configuration for any authentication mechanism
    600. # Configure which keys are used when authenticating a user. The default is
    601. # just :email. You can configure it to use [:username, :subdomain], so for
    602. # authenticating a user, both parameters are required. Remember that those
    603. # parameters are used only when authenticating and not when retrieving from
    604. # session. If you need permissions, you should implement that in a before filter.
    605. # You can also supply a hash where the value is a boolean determining whether
    606. # or not authentication should be aborted when the value is not present.
    607. # config.authentication_keys = [:email]
    608. # Configure parameters from the request object used for authentication. Each entry
    609. # given should be a request method and it will automatically be passed to the
    610. # find_for_authentication method and considered in your model lookup. For instance,
    611. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    612. # The same considerations mentioned for authentication_keys also apply to request_keys.
    613. # config.request_keys = []
    614. # Configure which authentication keys should be case-insensitive.
    615. # These keys will be downcased upon creating or modifying a user and when used
    616. # to authenticate or find a user. Default is :email.
    617. ======= <<<<<<< HEAD
    618. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    619. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 1214e1f (Add login registration pages)
    620. <<<<<<< HEAD
    621. # Configure which authentication keys should have whitespace stripped.
    622. # These keys will have whitespace before and after removed upon creating or
    623. # modifying a user and when used to authenticate or find a user. Default is :email.
    624. ======= <<<<<<< HEAD
    625. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    626. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> 1214e1f (Add login registration pages)
    627. <<<<<<< HEAD
    628. # Tell if authentication through request.params is enabled. True by default.
    629. # It can be set to an array that will enable params authentication only for the
    630. # given strategies, for example, `config.params_authenticatable = [:database]` will
    631. # enable it only for database (email + password) authentication.
    632. # config.params_authenticatable = true
    633. # Tell if authentication through HTTP Auth is enabled. False by default.
    634. # It can be set to an array that will enable http authentication only for the
    635. # given strategies, for example, `config.http_authenticatable = [:database]` will
    636. # enable it only for database authentication.
    637. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    638. # enable this with :database unless you are using a custom strategy.
    639. # The supported strategies are:
    640. # :database = Support basic authentication with authentication key + password
    641. # config.http_authenticatable = false
    642. # If 401 status code should be returned for AJAX requests. True by default.
    643. # config.http_authenticatable_on_xhr = true
    644. # The realm used in Http Basic Authentication. 'Application' by default.
    645. # config.http_authentication_realm = 'Application'
    646. # It will change confirmation, password recovery and other workflows
    647. # to behave the same regardless if the e-mail provided was right or wrong.
    648. # Does not affect registerable.
    649. # config.paranoid = true
    650. # By default Devise will store the user in session. You can skip storage for
    651. # particular strategies by setting this option.
    652. # Notice that if you are skipping storage for all authentication paths, you
    653. # may want to disable generating routes to Devise's sessions controller by
    654. # passing skip: :sessions to `devise_for` in your config/routes.rb
    655. ======= <<<<<<< HEAD
    656. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    657. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> 1214e1f (Add login registration pages)
    658. <<<<<<< HEAD
    659. # By default, Devise cleans up the CSRF token on authentication to
    660. # avoid CSRF token fixation attacks. This means that, when using AJAX
    661. # requests for sign in and sign up, you need to get a new CSRF token
    662. # from the server. You can disable this option at your own risk.
    663. # config.clean_up_csrf_token_on_authentication = true
    664. # When false, Devise will not attempt to reload routes on eager load.
    665. # This can reduce the time taken to boot the app but if your application
    666. # requires the Devise mappings to be loaded during boot time the application
    667. # won't boot properly.
    668. # config.reload_routes = true
    669. # ==> Configuration for :database_authenticatable
    670. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    671. # using other algorithms, it sets how many times you want the password to be hashed.
    672. # The number of stretches used for generating the hashed password are stored
    673. # with the hashed password. This allows you to change the stretches without
    674. # invalidating existing passwords.
    675. #
    676. # Limiting the stretches to just one in testing will increase the performance of
    677. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    678. # a value less than 10 in other environments. Note that, for bcrypt (the default
    679. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    680. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    681. ======= <<<<<<< HEAD
    682. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    683. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 1214e1f (Add login registration pages)
    684. <<<<<<< HEAD
    685. # Set up a pepper to generate the hashed password.
    686. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    687. # Send a notification to the original email when the user's email is changed.
    688. # config.send_email_changed_notification = false
    689. # Send a notification email when the user's password is changed.
    690. # config.send_password_change_notification = false
    691. # ==> Configuration for :confirmable
    692. # A period that the user is allowed to access the website even without
    693. # confirming their account. For instance, if set to 2.days, the user will be
    694. # able to access the website for two days without confirming their account,
    695. # access will be blocked just in the third day.
    696. # You can also set it to nil, which will allow the user to access the website
    697. # without confirming their account.
    698. # Default is 0.days, meaning the user cannot access the website without
    699. # confirming their account.
    700. # config.allow_unconfirmed_access_for = 2.days
    701. # A period that the user is allowed to confirm their account before their
    702. # token becomes invalid. For example, if set to 3.days, the user can confirm
    703. # their account within 3 days after the mail was sent, but on the fourth day
    704. # their account can't be confirmed with the token any more.
    705. # Default is nil, meaning there is no restriction on how long a user can take
    706. # before confirming their account.
    707. # config.confirm_within = 3.days
    708. # If true, requires any email changes to be confirmed (exactly the same way as
    709. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    710. # db field (see migrations). Until confirmed, new email is stored in
    711. # unconfirmed_email column, and copied to email column on successful confirmation.
    712. ======= <<<<<<< HEAD
    713. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    714. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> 1214e1f (Add login registration pages)
    715. # Defines which key will be used when confirming an account
    716. # config.confirmation_keys = [:email]
    717. # ==> Configuration for :rememberable
    718. # The time the user will be remembered without asking for credentials again.
    719. # config.remember_for = 2.weeks
    720. # Invalidates all the remember me tokens when the user signs out.
    721. 1 <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> 1214e1f (Add login registration pages)
    722. <<<<<<< HEAD
    723. # If true, extends the user's remember period when remembered via cookie.
    724. # config.extend_remember_period = false
    725. # Options to be passed to the created cookie. For instance, you can set
    726. # secure: true in order to force SSL only cookies.
    727. # config.rememberable_options = {}
    728. # ==> Configuration for :validatable
    729. # Range for password length.
    730. ======= <<<<<<< HEAD
    731. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    732. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 1214e1f (Add login registration pages)
    733. <<<<<<< HEAD
    734. # Email regex used to validate email formats. It simply asserts that
    735. # one (and only one) @ exists in the given string. This is mainly
    736. # to give user feedback and not to assert the e-mail validity.
    737. ======= <<<<<<< HEAD
    738. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    739. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 1214e1f (Add login registration pages)
    740. <<<<<<< HEAD
    741. # ==> Configuration for :timeoutable
    742. # The time you want to timeout the user session without activity. After this
    743. # time the user will be asked for credentials again. Default is 30 minutes.
    744. # config.timeout_in = 30.minutes
    745. # ==> Configuration for :lockable
    746. # Defines which strategy will be used to lock an account.
    747. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    748. # :none = No lock strategy. You should handle locking by yourself.
    749. # config.lock_strategy = :failed_attempts
    750. # Defines which key will be used when locking and unlocking an account
    751. # config.unlock_keys = [:email]
    752. # Defines which strategy will be used to unlock an account.
    753. # :email = Sends an unlock link to the user email
    754. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    755. # :both = Enables both strategies
    756. # :none = No unlock strategy. You should handle unlocking by yourself.
    757. # config.unlock_strategy = :both
    758. # Number of authentication tries before locking an account if lock_strategy
    759. # is failed attempts.
    760. # config.maximum_attempts = 20
    761. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    762. # config.unlock_in = 1.hour
    763. # Warn on the last attempt before the account is locked.
    764. # config.last_attempt_warning = true
    765. # ==> Configuration for :recoverable
    766. #
    767. # Defines which key will be used when recovering the password for an account
    768. # config.reset_password_keys = [:email]
    769. # Time interval you can reset your password with a reset password key.
    770. # Don't put a too small interval or your users won't have the time to
    771. # change their passwords.
    772. ======= <<<<<<< HEAD
    773. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    774. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 1214e1f (Add login registration pages)
    775. <<<<<<< HEAD
    776. # When set to false, does not sign a user in automatically after their password is
    777. # reset. Defaults to true, so a user is signed in automatically after a reset.
    778. # config.sign_in_after_reset_password = true
    779. # ==> Configuration for :encryptable
    780. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    781. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    782. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    783. # for default behavior) and :restful_authentication_sha1 (then you should set
    784. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    785. #
    786. # Require the `devise-encryptable` gem when using anything other than bcrypt
    787. # config.encryptor = :sha512
    788. # ==> Scopes configuration
    789. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    790. # "users/sessions/new". It's turned off by default because it's slower if you
    791. # are using only default views.
    792. # config.scoped_views = false
    793. # Configure the default scope given to Warden. By default it's the first
    794. # devise role declared in your routes (usually :user).
    795. # config.default_scope = :user
    796. # Set this configuration to false if you want /users/sign_out to sign out
    797. # only the current scope. By default, Devise signs out all scopes.
    798. # config.sign_out_all_scopes = true
    799. # ==> Navigation configuration
    800. # Lists the formats that should be treated as navigational. Formats like
    801. # :html, should redirect to the sign in page when the user does not have
    802. # access, but formats like :xml or :json, should return 401.
    803. #
    804. # If you have any extra navigational formats, like :iphone or :mobile, you
    805. # should add them to the navigational formats lists.
    806. #
    807. # The "*/*" below is required to match Internet Explorer requests.
    808. # config.navigational_formats = ['*/*', :html]
    809. # The default HTTP method used to sign out a resource. Default is :delete.
    810. ======= <<<<<<< HEAD
    811. >>>>>>> bae2b7de (Add login registration pages) 1 =======
    812. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 1214e1f (Add login registration pages)
    813. <<<<<<< HEAD
    814. ======= <<<<<<< HEAD
    815. 1 =======
    816. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    817. <<<<<<< HEAD # ==> OmniAuth ======= <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    818. <<<<<<< HEAD # Add a new OmniAuth provider. Check the wiki for more information on setting ======= <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    819. <<<<<<< HEAD # up on your models and hooks. ======= <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> 1214e1f (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages)
    820. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    821. # ==> Warden configuration
    822. # If you want to use other strategies, that are not supported by Devise, or
    823. # change the failure app, you can configure them inside the config.warden block.
    824. #
    825. # config.warden do |manager|
    826. # manager.intercept_401 = false
    827. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    828. # end
    829. # ==> Mountable engine configurations
    830. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    831. # is mountable, there are some extra configurations to be taken into account.
    832. # The following options are available, assuming the engine is mounted as:
    833. #
    834. # mount MyEngine, at: '/my_engine'
    835. #
    836. # The router that invoked `devise_for`, in the example above, would be:
    837. # config.router_name = :my_engine
    838. #
    839. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    840. # so you need to do it manually. For the users scope, it would be:
    841. # config.omniauth_path_prefix = '/my_engine/users/auth'
    842. # ==> Turbolinks configuration
    843. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    844. #
    845. # ActiveSupport.on_load(:devise_failure_app) do
    846. # include Turbolinks::Controller
    847. # end
    848. # ==> Configuration for :registerable
    849. # When set to false, does not sign a user in automatically after their password is
    850. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    851. # config.sign_in_after_change_password = true
    852. <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) # Configure the parent class to the devise controllers.
    853. # config.parent_controller = 'DeviseController'
    854. # ==> Mailer Configuration
    855. # Configure the e-mail address which will be shown in Devise::Mailer,
    856. # note that it will be overwritten if you use your own mailer class
    857. # with default "from" parameter.
    858. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 1 config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
    859. # Configure the class responsible to send e-mails.
    860. # config.mailer = 'Devise::Mailer'
    861. # Configure the parent class responsible to send e-mails.
    862. # config.parent_mailer = 'ActionMailer::Base'
    863. # ==> ORM configuration
    864. # Load and configure the ORM. Supports :active_record (default) and
    865. # :mongoid (bson_ext recommended) by default. Other ORMs may be
    866. # available as additional gems.
    867. 1 require 'devise/orm/active_record'
    868. # ==> Configuration for any authentication mechanism
    869. # Configure which keys are used when authenticating a user. The default is
    870. # just :email. You can configure it to use [:username, :subdomain], so for
    871. # authenticating a user, both parameters are required. Remember that those
    872. # parameters are used only when authenticating and not when retrieving from
    873. # session. If you need permissions, you should implement that in a before filter.
    874. # You can also supply a hash where the value is a boolean determining whether
    875. # or not authentication should be aborted when the value is not present.
    876. # config.authentication_keys = [:email]
    877. # Configure parameters from the request object used for authentication. Each entry
    878. # given should be a request method and it will automatically be passed to the
    879. # find_for_authentication method and considered in your model lookup. For instance,
    880. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
    881. # The same considerations mentioned for authentication_keys also apply to request_keys.
    882. # config.request_keys = []
    883. # Configure which authentication keys should be case-insensitive.
    884. # These keys will be downcased upon creating or modifying a user and when used
    885. # to authenticate or find a user. Default is :email.
    886. 1 config.case_insensitive_keys = [:email]
    887. # Configure which authentication keys should have whitespace stripped.
    888. # These keys will have whitespace before and after removed upon creating or
    889. # modifying a user and when used to authenticate or find a user. Default is :email.
    890. 1 config.strip_whitespace_keys = [:email]
    891. # Tell if authentication through request.params is enabled. True by default.
    892. # It can be set to an array that will enable params authentication only for the
    893. # given strategies, for example, `config.params_authenticatable = [:database]` will
    894. # enable it only for database (email + password) authentication.
    895. # config.params_authenticatable = true
    896. # Tell if authentication through HTTP Auth is enabled. False by default.
    897. # It can be set to an array that will enable http authentication only for the
    898. # given strategies, for example, `config.http_authenticatable = [:database]` will
    899. # enable it only for database authentication.
    900. # For API-only applications to support authentication "out-of-the-box", you will likely want to
    901. # enable this with :database unless you are using a custom strategy.
    902. # The supported strategies are:
    903. # :database = Support basic authentication with authentication key + password
    904. # config.http_authenticatable = false
    905. # If 401 status code should be returned for AJAX requests. True by default.
    906. # config.http_authenticatable_on_xhr = true
    907. # The realm used in Http Basic Authentication. 'Application' by default.
    908. # config.http_authentication_realm = 'Application'
    909. # It will change confirmation, password recovery and other workflows
    910. # to behave the same regardless if the e-mail provided was right or wrong.
    911. # Does not affect registerable.
    912. # config.paranoid = true
    913. # By default Devise will store the user in session. You can skip storage for
    914. # particular strategies by setting this option.
    915. # Notice that if you are skipping storage for all authentication paths, you
    916. # may want to disable generating routes to Devise's sessions controller by
    917. # passing skip: :sessions to `devise_for` in your config/routes.rb
    918. 1 config.skip_session_storage = [:http_auth]
    919. # By default, Devise cleans up the CSRF token on authentication to
    920. # avoid CSRF token fixation attacks. This means that, when using AJAX
    921. # requests for sign in and sign up, you need to get a new CSRF token
    922. # from the server. You can disable this option at your own risk.
    923. # config.clean_up_csrf_token_on_authentication = true
    924. # When false, Devise will not attempt to reload routes on eager load.
    925. # This can reduce the time taken to boot the app but if your application
    926. # requires the Devise mappings to be loaded during boot time the application
    927. # won't boot properly.
    928. # config.reload_routes = true
    929. # ==> Configuration for :database_authenticatable
    930. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
    931. # using other algorithms, it sets how many times you want the password to be hashed.
    932. # The number of stretches used for generating the hashed password are stored
    933. # with the hashed password. This allows you to change the stretches without
    934. # invalidating existing passwords.
    935. #
    936. # Limiting the stretches to just one in testing will increase the performance of
    937. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
    938. # a value less than 10 in other environments. Note that, for bcrypt (the default
    939. # algorithm), the cost increases exponentially with the number of stretches (e.g.
    940. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
    941. 1 config.stretches = Rails.env.test? ? 1 : 12
    942. # Set up a pepper to generate the hashed password.
    943. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
    944. # Send a notification to the original email when the user's email is changed.
    945. # config.send_email_changed_notification = false
    946. # Send a notification email when the user's password is changed.
    947. # config.send_password_change_notification = false
    948. # ==> Configuration for :confirmable
    949. # A period that the user is allowed to access the website even without
    950. # confirming their account. For instance, if set to 2.days, the user will be
    951. # able to access the website for two days without confirming their account,
    952. # access will be blocked just in the third day.
    953. # You can also set it to nil, which will allow the user to access the website
    954. # without confirming their account.
    955. # Default is 0.days, meaning the user cannot access the website without
    956. # confirming their account.
    957. # config.allow_unconfirmed_access_for = 2.days
    958. # A period that the user is allowed to confirm their account before their
    959. # token becomes invalid. For example, if set to 3.days, the user can confirm
    960. # their account within 3 days after the mail was sent, but on the fourth day
    961. # their account can't be confirmed with the token any more.
    962. # Default is nil, meaning there is no restriction on how long a user can take
    963. # before confirming their account.
    964. # config.confirm_within = 3.days
    965. # If true, requires any email changes to be confirmed (exactly the same way as
    966. # initial account confirmation) to be applied. Requires additional unconfirmed_email
    967. # db field (see migrations). Until confirmed, new email is stored in
    968. # unconfirmed_email column, and copied to email column on successful confirmation.
    969. 1 config.reconfirmable = true
    970. # Defines which key will be used when confirming an account
    971. # config.confirmation_keys = [:email]
    972. # ==> Configuration for :rememberable
    973. # The time the user will be remembered without asking for credentials again.
    974. # config.remember_for = 2.weeks
    975. # Invalidates all the remember me tokens when the user signs out.
    976. 1 config.expire_all_remember_me_on_sign_out = true
    977. # If true, extends the user's remember period when remembered via cookie.
    978. # config.extend_remember_period = false
    979. # Options to be passed to the created cookie. For instance, you can set
    980. # secure: true in order to force SSL only cookies.
    981. # config.rememberable_options = {}
    982. # ==> Configuration for :validatable
    983. # Range for password length.
    984. 1 config.password_length = 6..128
    985. # Email regex used to validate email formats. It simply asserts that
    986. # one (and only one) @ exists in the given string. This is mainly
    987. # to give user feedback and not to assert the e-mail validity.
    988. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
    989. # ==> Configuration for :timeoutable
    990. # The time you want to timeout the user session without activity. After this
    991. # time the user will be asked for credentials again. Default is 30 minutes.
    992. # config.timeout_in = 30.minutes
    993. # ==> Configuration for :lockable
    994. # Defines which strategy will be used to lock an account.
    995. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
    996. # :none = No lock strategy. You should handle locking by yourself.
    997. # config.lock_strategy = :failed_attempts
    998. # Defines which key will be used when locking and unlocking an account
    999. # config.unlock_keys = [:email]
    1000. # Defines which strategy will be used to unlock an account.
    1001. # :email = Sends an unlock link to the user email
    1002. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
    1003. # :both = Enables both strategies
    1004. # :none = No unlock strategy. You should handle unlocking by yourself.
    1005. # config.unlock_strategy = :both
    1006. # Number of authentication tries before locking an account if lock_strategy
    1007. # is failed attempts.
    1008. # config.maximum_attempts = 20
    1009. # Time interval to unlock the account if :time is enabled as unlock_strategy.
    1010. # config.unlock_in = 1.hour
    1011. # Warn on the last attempt before the account is locked.
    1012. # config.last_attempt_warning = true
    1013. # ==> Configuration for :recoverable
    1014. #
    1015. # Defines which key will be used when recovering the password for an account
    1016. # config.reset_password_keys = [:email]
    1017. # Time interval you can reset your password with a reset password key.
    1018. # Don't put a too small interval or your users won't have the time to
    1019. # change their passwords.
    1020. 1 config.reset_password_within = 6.hours
    1021. # When set to false, does not sign a user in automatically after their password is
    1022. # reset. Defaults to true, so a user is signed in automatically after a reset.
    1023. # config.sign_in_after_reset_password = true
    1024. # ==> Configuration for :encryptable
    1025. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
    1026. # You can use :sha1, :sha512 or algorithms from others authentication tools as
    1027. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
    1028. # for default behavior) and :restful_authentication_sha1 (then you should set
    1029. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
    1030. #
    1031. # Require the `devise-encryptable` gem when using anything other than bcrypt
    1032. # config.encryptor = :sha512
    1033. # ==> Scopes configuration
    1034. # Turn scoped views on. Before rendering "sessions/new", it will first check for
    1035. # "users/sessions/new". It's turned off by default because it's slower if you
    1036. # are using only default views.
    1037. # config.scoped_views = false
    1038. # Configure the default scope given to Warden. By default it's the first
    1039. # devise role declared in your routes (usually :user).
    1040. # config.default_scope = :user
    1041. # Set this configuration to false if you want /users/sign_out to sign out
    1042. # only the current scope. By default, Devise signs out all scopes.
    1043. # config.sign_out_all_scopes = true
    1044. # ==> Navigation configuration
    1045. # Lists the formats that should be treated as navigational. Formats like
    1046. # :html, should redirect to the sign in page when the user does not have
    1047. # access, but formats like :xml or :json, should return 401.
    1048. #
    1049. # If you have any extra navigational formats, like :iphone or :mobile, you
    1050. # should add them to the navigational formats lists.
    1051. #
    1052. # The "*/*" below is required to match Internet Explorer requests.
    1053. # config.navigational_formats = ['*/*', :html]
    1054. # The default HTTP method used to sign out a resource. Default is :delete.
    1055. 1 config.sign_out_via = :delete
    1056. # ==> OmniAuth
    1057. # Add a new OmniAuth provider. Check the wiki for more information on setting
    1058. # up on your models and hooks.
    1059. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
    1060. # ==> Warden configuration
    1061. # If you want to use other strategies, that are not supported by Devise, or
    1062. # change the failure app, you can configure them inside the config.warden block.
    1063. #
    1064. # config.warden do |manager|
    1065. # manager.intercept_401 = false
    1066. # manager.default_strategies(scope: :user).unshift :some_external_strategy
    1067. # end
    1068. # ==> Mountable engine configurations
    1069. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
    1070. # is mountable, there are some extra configurations to be taken into account.
    1071. # The following options are available, assuming the engine is mounted as:
    1072. #
    1073. # mount MyEngine, at: '/my_engine'
    1074. #
    1075. # The router that invoked `devise_for`, in the example above, would be:
    1076. # config.router_name = :my_engine
    1077. #
    1078. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
    1079. # so you need to do it manually. For the users scope, it would be:
    1080. # config.omniauth_path_prefix = '/my_engine/users/auth'
    1081. # ==> Turbolinks configuration
    1082. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
    1083. #
    1084. # ActiveSupport.on_load(:devise_failure_app) do
    1085. # include Turbolinks::Controller
    1086. # end
    1087. # ==> Configuration for :registerable
    1088. # When set to false, does not sign a user in automatically after their password is
    1089. # changed. Defaults to true, so a user is signed in automatically after changing a password.
    1090. # config.sign_in_after_change_password = true
    1091. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/filter_parameter_logging.rb

    100.0% lines covered

    1 relevant lines. 1 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Configure sensitive parameters which will be filtered from the log file.
    3. 1 Rails.application.config.filter_parameters += %i[
    4. passw secret token _key crypt salt certificate otp ssn
    5. ]

    config/initializers/inflections.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new inflection rules using the following format. Inflections
    3. # are locale specific, and you may define rules for as many different
    4. # locales as you wish. All of these examples are active by default:
    5. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    6. # inflect.plural /^(ox)$/i, '\1en'
    7. # inflect.singular /^(ox)en/i, '\1'
    8. # inflect.irregular 'person', 'people'
    9. # inflect.uncountable %w( fish sheep )
    10. # end
    11. # These inflection rules are supported but not enabled by default:
    12. # ActiveSupport::Inflector.inflections(:en) do |inflect|
    13. # inflect.acronym 'RESTful'
    14. # end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/kaminari.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. 1 Kaminari.configure do |config|
    2. 1 config.page_method_name = :per_page_kaminari
    3. end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/mime_types.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # Add new mime types for use in respond_to blocks:
    3. # Mime::Type.register "text/richtext", :rtf
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
    ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs)
    >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD =======
    >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9c0d812 (Featire specs)
    >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD
    >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true)
    >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
    >>>>>>> 56fd9d41 (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> ebcdce06 (Featire specs)
    =======
    >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
    >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD
    >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
    >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
    >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/money.rb

    100.0% lines covered

    3 relevant lines. 3 lines covered and 0 lines missed.
        
    1. 1 Money.locale_backend = :i18n
    2. 1 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
    3. 1 Money.default_currency = Money::Currency.new('EUR')
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/omniauth.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= ======= ======= ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 11792758 (Rebased) ======= 3 relevant lines. 3 lines covered and >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> 4976a174 (Add login registration pages) ======= ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> ef483b6d (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) OmniAuth.config.logger = Rails.logger
    2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Rails.application.config.middleware.use OmniAuth::Builder do
    3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
    4. =======
    5. >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
    6. >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages)
    7. =======
    8. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    10. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= =======
    11. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= =======
    12. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased)
    13. =======
    14. >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
    15. =======
    16. >>>>>>> 1214e1f (Add login registration pages) =======
    17. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    18. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= =======
    19. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    20. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    21. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    22. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= =======
    23. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
    24. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    25. >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= =======
    26. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) =======
    27. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= =======
    28. >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
    29. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    30. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= =======
    31. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= =======
    32. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
    33. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= provider :facebook, >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= provider :facebook, >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= provider :facebook, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= provider :facebook, >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= provider :facebook, >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    35. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
    36. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
    37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> c7a726c5 (Rebased) ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' >>>>>>> ef483b6d (Fix) ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
    38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
    39. >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) =======
    40. >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= =======
    41. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= =======
    42. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= =======
    43. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) =======
    44. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= =======
    45. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    46. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    47. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
    48. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
    49. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
    50. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= =======
    51. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= =======
    52. >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 311e9fa (Rebased) =======
    53. <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= =======
    54. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
    55. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
    56. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
    57. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
    58. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
    59. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= =======
    60. >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 793a6ed (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

    config/initializers/permissions_policy.rb

    100.0% lines covered

    0 relevant lines. 0 lines covered and 0 lines missed.
        
    1. # Define an application-wide HTTP permissions policy. For further
    2. # information see https://developers.google.com/web/updates/2018/06/feature-policy
    3. #
    4. # Rails.application.config.permissions_policy do |f|
    5. # f.camera :none
    6. # f.gyroscope :none
    7. # f.microphone :none
    8. # f.usb :none
    9. # f.fullscreen :self
    10. # f.payment :self, "https://secure.example.com"
    11. # end

    config/initializers/wrap_parameters.rb

    100.0% lines covered

    2 relevant lines. 2 lines covered and 0 lines missed.
        
    1. # Be sure to restart your server when you modify this file.
    2. # This file contains settings for ActionController::ParamsWrapper which
    3. # is enabled by default.
    4. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
    5. 1 ActiveSupport.on_load(:action_controller) do
    6. 2 wrap_parameters format: [:json]
    7. end
    8. # To enable root element in JSON for ActiveRecord objects.
    9. # ActiveSupport.on_load(:active_record) do
    10. # self.include_root_in_json = true
    11. # end

    config/routes.rb

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= 3 relevant lines. 3 lines covered and ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 0561be1d (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2be0d057 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4976a174 (Add login registration pages) ======= ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= 9 relevant lines. 9 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
        
    1. 1 <<<<<<< HEAD require 'sidekiq/web'
    2. <<<<<<< HEAD
    3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= ======= >>>>>>> 512d1d87 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) root 'home#index' ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) >>>>>>> 31507b8 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4976a174 (Add login registration pages) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e60833c (Add login registration pages) >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> ed8ea634 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) <<<<<<< HEAD >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0561be1d (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) <<<<<<< HEAD >>>>>>> 512d1d87 (Add login registration pages) ======= ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) >>>>>>> 4976a174 (Add login registration pages)
    4. =======
    5. >>>>>>> 7c4ea7f (Fix)
    6. 1 ======= >>>>>>> 6da9530 (Featire specs) Rails.application.routes.draw do
    7. <<<<<<< HEAD =======
    8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased)
    9. >>>>>>> 6da9530 (Featire specs)
    10. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f6e20266 (Add login registration pages) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0561be1d (Add login registration pages) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 512d1d87 (Add login registration pages) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4976a174 (Add login registration pages) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> bae2b7de (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> d8abfed3 (Featire specs) root 'home#index' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ActiveAdmin.routes(self) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ActiveAdmin.routes(self) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= resources :books, only: %i[show index] ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e60833c (Add login registration pages) ======= ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> f416f45 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs)
    11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
    12. 1 <<<<<<< HEAD authenticate :admin_user do
    13. <<<<<<< HEAD
    14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) end
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
    ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. end
    >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
    4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    5. <<<<<<< HEAD
    6. 2 ======= ======= >>>>>>> 5b7749a (Fix)
    7. 1 mount Sidekiq::Web => '/sidekiq'
    8. end
    9. 1 ActiveAdmin.routes(self)
    10. <<<<<<< HEAD end
    11. end
    12. <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
    <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. ======= >>>>>>> 5b7749a (Fix)
    3. <<<<<<< HEAD
    4. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    5. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs)
    6. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
    7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
    8. =======
    9. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD resources :books, only: %i[show index]
    10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
    >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ActiveAdmin.routes(self) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
    =======

    spec/decorators/author_decorator_spec.rb

    100.0% lines covered

    7 relevant lines. 7 lines covered and 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) }
    4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    5. 1 context 'when decorate' do
    6. 1 it '#full_name' do
    7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    8. end
    9. end
    10. end
    >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

    spec/decorators/author_decorator_spec.rb

    =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
    3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true)
    4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased)
    5. <<<<<<< HEAD
    6. =======
    7. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
    8. 1 context 'when decorate' do
    9. 1 it '#full_name' do
    10. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
    11. end
    12. end
    13. ======= >>>>>>> 7a02bbe (Featire specs) end
    <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

    spec/decorators/book_decorator_spec.rb

    >>>>>>> bd8bda4 (Manifest_cache true) =======

    spec/decorators/book_decorator_spec.rb

    >>>>>>> aa7b40c (Manifest_cache true)

    100.0% lines covered

    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
        
    1. 1 require 'rails_helper'
    2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD resources :books, only: %i[show index]
    3. >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD authenticate :admin_user do ======= ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) resources :books, only: %i[show index] >>>>>>> c7a726c5 (Rebased)
    4. <<<<<<< HEAD <<<<<<< HEAD =======
    5. ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)
    6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } ======= ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) resources :books, only: %i[show index]
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      5. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      6. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      7. =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      9. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 84003439 (Featire specs)
      4. <<<<<<< HEAD
      5. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 84003439 (Featire specs) devise_for :users >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD resources :books, only: %i[show index] >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. <<<<<<< HEAD
      7. =======
      8. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD
      9. <<<<<<< HEAD
      10. =======
      11. >>>>>>> 6da9530 (Featire specs) 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      12. <<<<<<< HEAD
      13. =======
      14. >>>>>>> 6da9530 (Featire specs)
      15. <<<<<<< HEAD
      16. =======
      17. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) root 'home#index'
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)
      19. =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. >>>>>>> 6da9530 (Featire specs)
      22. <<<<<<< HEAD
      23. =======
      24. >>>>>>> 6da9530 (Featire specs) 1 resources :users
      25. <<<<<<< HEAD
      26. <<<<<<< HEAD
      27. 1 =======
      28. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) resources :books, only: %i[show index] do
      29. <<<<<<< HEAD
      30. 1 =======
      31. ======= ======= >>>>>>> 5b7749a (Fix)
      32. 1 resources :orders, only: %i[index] do
      33. 1 get '/add_to_order', to: 'order_books#add_to_order'
      34. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
      35. 1 put '/order_update_book', to: 'order_books#update_quantity'
      36. end
      37. 1 get '/coupon_check', to: 'coupons#find'
      38. 1 resources :users
      39. 1 resources :books, only: %i[show index] do
      40. 1 resources :reviews, only: :create
      41. end
      42. ======= >>>>>>> bae2b7de (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. end
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      ======= =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. <<<<<<< HEAD
      6. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      7. 1 mount Sidekiq::Web => '/sidekiq'
      8. end
      9. 1 ActiveAdmin.routes(self)
      10. <<<<<<< HEAD end
      11. end
      12. <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) end
      <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. ======= >>>>>>> 5b7749a (Fix)
      3. <<<<<<< HEAD
      4. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      5. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs)
      6. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      8. =======
      9. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD resources :books, only: %i[show index]
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) end
      >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD root 'home#index' >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) end
      <<<<<<< HEAD
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> 610b6138 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true)
      4. <<<<<<< HEAD
      5. =======
      6. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      7. 1 context 'when decorate' do
      8. 1 it '#full_name' do
      9. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      10. end
      11. end
      12. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. >>>>>>> e5752db (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
      3. <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
      =======

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
      5. 1 context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. end
      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) RSpec.describe AuthorDecorator do
      3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      5. 1 <<<<<<< HEAD ======= context 'when decorate' do
      6. 1 it '#full_name' do
      7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
      8. end
      9. end
      10. ======= >>>>>>> 7a02bbe (Featire specs) end
      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/book_decorator_spec.rb

      >>>>>>> bd8bda4 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> aa7b40c (Manifest_cache true)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 5 relevant lines. 5 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 RSpec.describe AuthorDecorator, type: :decorator do
      2. <<<<<<< HEAD
      3. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
      4. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      5. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      6. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) resources :books, only: %i[show index]
      7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs)
      8. ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      9. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======
      10. ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      11. =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      13. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AuthorDecorator do
      3. 2 let(:decorator) { described_class.new(author) }
      4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD =======
      5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      6. 1 <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) devise_for :users >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD
      7. =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      9. 1 resources :users >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      10. <<<<<<< HEAD
      11. 1 =======
      12. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
      13. <<<<<<< HEAD
      14. ======= <<<<<<< HEAD
      15. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) 1 =======
      16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 11792758 (Rebased) root 'home#index'
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
      18. 1 resources :users
      19. 1 resources :books, only: %i[show index] do
      20. 1 <<<<<<< HEAD =======
      21. ======= ======= >>>>>>> 5b7749a (Fix)
      22. ======= >>>>>>> 11792758 (Rebased)
      23. <<<<<<< HEAD
      24. 1 resources :orders, only: %i[index] do
      25. 1 get '/add_to_order', to: 'order_books#add_to_order'
      26. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
      27. 1 put '/order_update_book', to: 'order_books#update_quantity'
      28. =======
      29. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      30. >>>>>>> 11792758 (Rebased) end
      31. <<<<<<< HEAD <<<<<<< HEAD
      32. 1 get '/coupon_check', to: 'coupons#find'
      33. 1 resources :users
      34. 1 resources :books, only: %i[show index] do
      35. 1 resources :reviews, only: :create
      36. end
      37. =======
      38. >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 11792758 (Rebased) end
      <<<<<<< HEAD
      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 160fb15 (Fix) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d9d85ca6 (Fix) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      ======= >>>>>>> b15044a (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 02a399d (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> fd6db03 (Manifest_cache true) =======

      spec/decorators/author_decorator_spec.rb

      >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)

      spec/decorators/author_decorator_spec.rb

      ======= >>>>>>> b15044a (Manifest_cache true) =======

      spec/decorators/book_decorator_spec.rb

      <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/decorators/book_decorator_spec.rb

      >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) 5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> fdab719f (Fix) ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> c8da2e3 (Fix) ======= 5 relevant lines. 5 lines covered and <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= ======= RSpec.describe AuthorDecorator, type: :decorator do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= >>>>>>> c8da2e3 (Fix) require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix)
      3. 2 subject(:decorated_object) { described_class.new(author) }
      4. <<<<<<< HEAD ======= ======= ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD
      5. >>>>>>> 9a49b7b (Rebased) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
      6. 2 >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD
      7. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      8. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      9. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      10. 2 >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix)
      11. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      12. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      13. 2 >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      14. 2 >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      16. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      17. 1 >>>>>>> 824bb2b (Featire specs) =======
      18. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      19. 1 >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix)
      20. 2 ======= ======= >>>>>>> 5b7749a (Fix)
      21. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= =======
      22. 1 >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= =======
      23. 1 >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) let(:author) { create(:author) } ======= RSpec.describe BookDecorator do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BookDecorator do >>>>>>> 0d6dd12 (Manifest_cache true) ======= RSpec.describe BookDecorator do >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= RSpec.describe BookDecorator do >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      25. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      26. ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      27. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      28. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      29. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      30. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      31. <<<<<<< HEAD =======
      32. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      33. >>>>>>> bd8bda4 (Manifest_cache true) =======
      34. >>>>>>> aa7b40c (Manifest_cache true) =======
      35. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      36. >>>>>>> 02a399d (Manifest_cache true) =======
      37. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) =======
      39. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      40. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      41. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      42. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      43. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      44. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      46. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
      47. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      48. ======= <<<<<<< HEAD
      49. =======
      50. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      51. >>>>>>> bd8bda4 (Manifest_cache true) =======
      52. >>>>>>> aa7b40c (Manifest_cache true) =======
      53. >>>>>>> 183b6c5 (Manifest_cache true) =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe '#full_name' do ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> 0d6dd12 (Manifest_cache true) ======= let(:authors) do >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= let(:authors) do >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      56. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      57. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      58. ======= <<<<<<< HEAD
      59. =======
      60. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      61. >>>>>>> bd8bda4 (Manifest_cache true) =======
      62. >>>>>>> aa7b40c (Manifest_cache true) =======
      63. >>>>>>> 183b6c5 (Manifest_cache true) =======
      64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) end ======= [ >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> 0d6dd12 (Manifest_cache true) ======= [ >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= [ >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD
      66. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs)
      67. <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      68. ======= <<<<<<< HEAD
      69. =======
      70. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      71. >>>>>>> bd8bda4 (Manifest_cache true) =======
      72. >>>>>>> aa7b40c (Manifest_cache true) =======
      73. >>>>>>> 183b6c5 (Manifest_cache true) =======
      74. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true)
      75. >>>>>>> c033601 (Rebased) 2 =======
      76. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      77. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 824bb2b (Featire specs) ======= =======
      78. 2 >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) subject(:decorated_object) { described_class.new(author) }
      79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      80. ======= <<<<<<< HEAD
      81. =======
      82. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      83. >>>>>>> bd8bda4 (Manifest_cache true) =======
      84. >>>>>>> aa7b40c (Manifest_cache true) =======
      85. >>>>>>> 183b6c5 (Manifest_cache true) =======
      86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= =======
      88. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
      89. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      90. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      92. ======= <<<<<<< HEAD
      93. =======
      94. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      95. >>>>>>> bd8bda4 (Manifest_cache true) =======
      96. >>>>>>> aa7b40c (Manifest_cache true) =======
      97. >>>>>>> 183b6c5 (Manifest_cache true) =======
      98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      99. 2 =======
      100. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      101. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      102. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      103. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      104. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) RSpec.describe BookDecorator do ======= >>>>>>> 5b7749a (Fix)
      105. <<<<<<< HEAD
      106. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      108. >>>>>>> bd8bda4 (Manifest_cache true) =======
      109. >>>>>>> aa7b40c (Manifest_cache true) =======
      110. >>>>>>> 183b6c5 (Manifest_cache true) =======
      111. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      112. ======= ======= >>>>>>> b15044a (Manifest_cache true)
      113. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      114. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      115. >>>>>>> 7c4ea7f (Fix)
      116. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) describe '#full_name' do
      117. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      118. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= end
      119. end

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      15 relevant lines. 15 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. 1 let(:book) do
      4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      5. categories_count: 0,
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. =======
      8. >>>>>>> ae2a012 (Manifest_cache true) =======
      9. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      11. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= [ >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= authors_count: 0) >>>>>>> 5b7749a (Fix)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix)
      13. <<<<<<< HEAD =======
      14. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      15. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      16. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      17. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      18. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      19. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= end >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      21. 1 =======
      22. >>>>>>> 02a399d (Manifest_cache true) =======
      23. =======
      24. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) =======
      25. >>>>>>> bd8bda4 (Manifest_cache true) =======
      26. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      29. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      30. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= let(:authors) do >>>>>>> 5b7749a (Fix)
      31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      32. =======
      33. >>>>>>> ae2a012 (Manifest_cache true) =======
      34. >>>>>>> bd8bda4 (Manifest_cache true) =======
      35. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      36. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      37. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      39. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      40. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) [
      41. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      42. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      43. ======= >>>>>>> 6da9530 (Featire specs)
      44. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      45. 1 resources :books, only: %i[show index] do
      46. 1 resources :reviews, only: :create
      47. end
      48. end
      <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ] ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      =======
      >>>>>>> c033601 (Rebased)

      spec/decorators/author_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) 0 lines missed.
          
      1. 1 RSpec.describe AuthorDecorator, type: :decorator do
      2. <<<<<<< HEAD
      3. 1 RSpec.describe BookDecorator do
      4. 3 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      5. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      6. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      7. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      8. <<<<<<< HEAD =======
      9. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      10. >>>>>>> bd8bda4 (Manifest_cache true) =======
      11. >>>>>>> aa7b40c (Manifest_cache true) =======
      12. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      13. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      14. ======= <<<<<<< HEAD
      15. =======
      16. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      17. >>>>>>> bd8bda4 (Manifest_cache true) =======
      18. >>>>>>> aa7b40c (Manifest_cache true) =======
      19. >>>>>>> 183b6c5 (Manifest_cache true) =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 1 let(:authors) do
      21. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      22. ======= <<<<<<< HEAD
      23. =======
      24. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      25. >>>>>>> bd8bda4 (Manifest_cache true) =======
      26. >>>>>>> aa7b40c (Manifest_cache true) =======
      27. >>>>>>> 183b6c5 (Manifest_cache true) =======
      28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) [
      29. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      30. ======= <<<<<<< HEAD
      31. =======
      32. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      33. >>>>>>> bd8bda4 (Manifest_cache true) =======
      34. >>>>>>> aa7b40c (Manifest_cache true) =======
      35. >>>>>>> 183b6c5 (Manifest_cache true) =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> c033601 (Rebased) 2 subject(:decorated_object) { described_class.new(author) } >>>>>>> 6da9530 (Featire specs)
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD =======
      40. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      41. ======= <<<<<<< HEAD
      42. =======
      43. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      44. >>>>>>> bd8bda4 (Manifest_cache true) =======
      45. >>>>>>> aa7b40c (Manifest_cache true) =======
      46. >>>>>>> 183b6c5 (Manifest_cache true) =======
      47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      48. >>>>>>> c033601 (Rebased)
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      50. ======= <<<<<<< HEAD
      51. =======
      52. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      53. >>>>>>> bd8bda4 (Manifest_cache true) =======
      54. >>>>>>> aa7b40c (Manifest_cache true) =======
      55. >>>>>>> 183b6c5 (Manifest_cache true) =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ]
      57. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      58. ======= <<<<<<< HEAD
      59. =======
      60. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= =======
      61. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      62. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      64. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      65. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      66. >>>>>>> aa7b40c (Manifest_cache true) =======
      67. >>>>>>> 183b6c5 (Manifest_cache true) =======
      68. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) end
      69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      70. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      71. ======= <<<<<<< HEAD
      72. =======
      73. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      74. >>>>>>> bd8bda4 (Manifest_cache true) =======
      75. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      76. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      77. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      78. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      79. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      80. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      81. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      82. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      83. >>>>>>> 183b6c5 (Manifest_cache true) =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) 1 let(:categories) do
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      86. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      87. ======= <<<<<<< HEAD
      88. =======
      89. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      90. >>>>>>> bd8bda4 (Manifest_cache true) =======
      91. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      92. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      94. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      95. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      96. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      97. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      98. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      99. >>>>>>> 183b6c5 (Manifest_cache true) =======
      100. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) [
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      102. 3 >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      103. ======= <<<<<<< HEAD
      104. =======
      105. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      106. >>>>>>> bd8bda4 (Manifest_cache true) =======
      107. >>>>>>> aa7b40c (Manifest_cache true) =======
      108. >>>>>>> 183b6c5 (Manifest_cache true) =======
      109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 84003439 (Featire specs)
      110. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      111. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      112. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      113. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      114. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      115. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      116. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      117. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      118. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      119. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      120. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      121. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      122. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      123. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      124. >>>>>>> c033601 (Rebased) 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) let(:author) { create(:author) } <<<<<<< HEAD ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) RSpec.describe BookDecorator do ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= let(:author) { create(:author) } >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      125. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      126. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true)
      127. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
      128. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      130. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      131. ======= <<<<<<< HEAD
      132. =======
      133. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      134. >>>>>>> bd8bda4 (Manifest_cache true) =======
      135. >>>>>>> aa7b40c (Manifest_cache true) =======
      136. >>>>>>> 183b6c5 (Manifest_cache true) =======
      137. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      138. <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      139. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      140. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      141. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      142. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      143. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      144. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD ======= =======
      145. >>>>>>> bd8bda4 (Manifest_cache true) =======
      146. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      147. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      148. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      149. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      150. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      151. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
      152. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      153. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      154. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
      155. =======
      156. =======
      157. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) =======
      158. >>>>>>> bd8bda4 (Manifest_cache true) =======
      159. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      160. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      161. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      162. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      163. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      164. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      165. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      166. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      167. >>>>>>> 7c4ea7f (Fix) =======
      168. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      169. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
      170. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      171. >>>>>>> 183b6c5 (Manifest_cache true) =======
      172. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      173. 1 >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) describe '#full_name' do
      174. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      175. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      176. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      177. ======= <<<<<<< HEAD
      178. =======
      179. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      180. >>>>>>> bd8bda4 (Manifest_cache true) =======
      181. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      182. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      183. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)
      184. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      185. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      186. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      187. >>>>>>> e3e66f3 (Featire specs) =======
      188. [
      189. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      190. >>>>>>> a5d032d (Fix) <<<<<<< HEAD =======
      191. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      192. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      193. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      194. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
      195. >>>>>>> 6da9530 (Featire specs) 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      196. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      197. >>>>>>> c033601 (Rebased) =======
      198. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      199. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      200. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
      201. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      202. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      203. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      204. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
      205. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) end
      206. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      207. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)
      208. >>>>>>> c59d1a99 (Manifest_cache true) 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      209. <<<<<<< HEAD
      210. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      211. >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      212. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      213. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      214. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      215. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      216. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      217. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      218. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      219. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      220. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      221. ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
      222. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      223. =======
      224. >>>>>>> 02a399d (Manifest_cache true) =======
      225. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      226. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      227. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      228. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      229. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      230. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      231. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) describe '#full_name' do ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      232. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      233. =======
      234. >>>>>>> c7a726c5 (Rebased) 2 ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD
      235. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      236. 2 =======
      237. 1 >>>>>>> 02a399d (Manifest_cache true) =======
      238. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= =======
      239. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      240. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      241. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      242. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      243. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      244. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      245. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      246. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      247. 1 =======
      248. >>>>>>> fd6db03 (Manifest_cache true) =======
      249. >>>>>>> 998f08d (Manifest_cache true) =======
      250. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 6da9530 (Featire specs)
      251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) end
      252. 1 it '#categories_names' do
      253. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      254. end
      255. =======
      256. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      257. >>>>>>> bd8bda4 (Manifest_cache true) =======
      258. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      259. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      260. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      261. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      262. <<<<<<< HEAD ======= <<<<<<< HEAD
      263. ======= >>>>>>> 7375d4b (Manifest_cache true)
      264. end
      265. 1 it '#categories_names' do
      266. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      267. end
      268. >>>>>>> bd30d038 (Manifest_cache true) end
      269. <<<<<<< HEAD ======= <<<<<<< HEAD
      270. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      271. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price)
      272. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= =======
      273. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
      274. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
      275. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      276. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      277. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      278. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= =======
      279. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      280. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      281. >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
      282. ]
      283. end
      284. 1 let(:categories) do
      285. [
      286. 2 FactoryBot.create(:category, name: 'Poetry'),
      287. FactoryBot.create(:category, name: 'Novel')
      288. ]
      289. end
      290. 1 context 'when decorate' do
      291. 1 it '#authors_names' do
      292. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      293. end
      294. 1 it '#categories_names' do
      295. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      296. end
      297. end
      298. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) end
      <<<<<<< HEAD
      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= =======
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      >>>>>>> c033601 (Rebased) =======
      >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 15 relevant lines. 15 lines covered and >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BookDecorator do
      5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs)
      7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
      8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
      10. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      11. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      14. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, ======= ======= ======= categories_count: 0, >>>>>>> 6da9530 (Featire specs)
      15. <<<<<<< HEAD <<<<<<< HEAD
      16. =======
      17. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      19. =======
      20. >>>>>>> ae2a012 (Manifest_cache true) =======
      21. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= [ >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= authors_count: 0) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      24. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      25. >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD
      26. >>>>>>> fdab719f (Fix) ======= >>>>>>> 5b7749a (Fix)
      27. <<<<<<< HEAD =======
      28. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      29. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      30. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      31. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      32. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      33. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      34. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      35. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix)
      36. <<<<<<< HEAD ======= =======
      37. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      38. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      39. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      40. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      41. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      42. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= =======
      43. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. >>>>>>> ae2a012 (Manifest_cache true) =======
      45. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= end >>>>>>> 5b7749a (Fix) ======= subject(:decorated_object) { described_class.new(author) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      47. 1 ======= =======
      48. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      49. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      50. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      51. =======
      52. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      53. >>>>>>> bd8bda4 (Manifest_cache true) =======
      54. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      55. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      56. =======
      57. >>>>>>> c7a726c5 (Rebased) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      58. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      59. 1 >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      60. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      61. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= let(:authors) do >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      63. ======= =======
      64. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      65. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      66. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      67. >>>>>>> bd8bda4 (Manifest_cache true) =======
      68. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      69. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      70. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      72. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      73. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      74. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      75. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      76. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) [
      77. <<<<<<< HEAD
      78. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
      79. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
      80. 3 ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      81. =======
      82. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      83. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      84. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      85. <<<<<<< HEAD
      86. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      87. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      88. ======= <<<<<<< HEAD <<<<<<< HEAD
      89. ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      90. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      91. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      92. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      93. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      94. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      95. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ]
      96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      97. <<<<<<< HEAD ======= =======
      98. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      99. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      100. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      101. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      102. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      103. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      104. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      105. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      106. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      107. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      108. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      109. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      110. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      111. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      112. ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      113. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      114. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD
      115. =======
      116. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      117. >>>>>>> bd8bda4 (Manifest_cache true) =======
      118. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      119. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      121. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      122. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      123. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      124. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      125. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      126. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      127. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      128. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) 1 let(:categories) do
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      130. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      131. ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      132. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      133. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD
      134. =======
      135. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      136. >>>>>>> bd8bda4 (Manifest_cache true) =======
      137. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      138. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      139. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
      140. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      141. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      142. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      143. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      144. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      145. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      146. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      147. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) [
      148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      149. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= =======
      150. 3 ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      151. 3 ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix)
      152. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      153. =======
      154. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      155. >>>>>>> bd8bda4 (Manifest_cache true) =======
      156. >>>>>>> aa7b40c (Manifest_cache true) =======
      157. >>>>>>> 183b6c5 (Manifest_cache true) =======
      158. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true)
      159. >>>>>>> c033601 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      160. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      161. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
      162. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
      163. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      164. >>>>>>> c033601 (Rebased) 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      165. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      166. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      167. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      168. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      169. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      170. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      171. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      172. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) let(:author) { create(:author) } ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= let(:author) { create(:author) } >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
      173. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      174. >>>>>>> 31d15e66 (Fix) =======
      175. >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      176. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true)
      177. <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD
      178. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      179. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true)
      180. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      181. ======= <<<<<<< HEAD
      182. =======
      183. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      184. >>>>>>> bd8bda4 (Manifest_cache true) =======
      185. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      186. >>>>>>> 183b6c5 (Manifest_cache true) =======
      187. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      188. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      189. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      190. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      191. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      192. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      193. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      194. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) ======= =======
      195. >>>>>>> bd8bda4 (Manifest_cache true) =======
      196. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      197. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      198. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      199. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      200. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      201. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      202. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      203. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) =======
      205. ======= =======
      206. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      207. >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      208. >>>>>>> 2722d07 (Manifest_cache true) =======
      209. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      210. ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD
      211. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      212. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      213. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      214. ======= <<<<<<< HEAD
      215. =======
      216. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      217. >>>>>>> bd8bda4 (Manifest_cache true) =======
      218. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      219. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      220. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD =======
      221. ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      222. =======
      223. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      224. >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      225. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      226. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) =======
      227. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      228. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
      229. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
      230. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
      231. >>>>>>> 7c4ea7f (Fix) ======= =======
      232. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      233. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) =======
      234. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      235. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
      236. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= >>>>>>> c8da2e3 (Fix) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) describe '#full_name' do ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      237. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) =======
      238. ======= =======
      239. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      240. ======= >>>>>>> c8da2e3 (Fix)
      241. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      242. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
      243. >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      244. ======= <<<<<<< HEAD
      245. =======
      246. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      247. >>>>>>> bd8bda4 (Manifest_cache true) =======
      248. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD ======= =======
      249. >>>>>>> bd8bda4 (Manifest_cache true) =======
      250. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      251. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
      252. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      253. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      254. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
      255. >>>>>>> e3e66f3 (Featire specs) =======
      256. [
      257. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      258. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      259. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= =======
      260. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= =======
      261. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      262. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) =======
      263. >>>>>>> c7a726c5 (Rebased) 2 ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> fdab719f (Fix) <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= let(:author) { create(:author) } >>>>>>> c7a726c5 (Rebased)
      264. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      265. ======= =======
      266. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      267. ======= >>>>>>> c8da2e3 (Fix)
      268. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 557c1b8 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      269. >>>>>>> c033601 (Rebased) =======
      270. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      271. >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD =======
      272. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) =======
      273. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD =======
      274. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      275. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      276. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      277. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      278. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
      279. 1 describe '#full_name' do
      280. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
      281. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      282. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      283. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      284. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) end
      285. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix)
      286. ======= =======
      287. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      288. ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= =======
      289. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      290. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      291. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      292. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
      293. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      294. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      295. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      296. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      297. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      298. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      299. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      300. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      301. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      302. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= =======
      303. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true)
      304. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      305. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      306. ======= =======
      307. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      308. ======= >>>>>>> c8da2e3 (Fix)
      309. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      310. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
      311. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      312. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      313. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      314. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      315. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= =======
      316. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      317. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      318. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      319. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= describe '#categories_names' do ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) it '#authors_names' do <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      320. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      321. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix)
      322. 2 ======= =======
      323. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
      324. 2 ======= >>>>>>> c8da2e3 (Fix)
      325. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      326. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      327. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) =======
      328. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      329. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= =======
      330. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      331. 2 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      332. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      333. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      334. <<<<<<< HEAD <<<<<<< HEAD =======
      335. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
      336. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true)
      337. 1 =======
      338. =======
      339. =======
      340. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      341. >>>>>>> 998f08d (Manifest_cache true) =======
      342. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD end >>>>>>> 998f08d (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true)
      343. <<<<<<< HEAD <<<<<<< HEAD
      344. ======= <<<<<<< HEAD
      345. =======
      346. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
      347. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) end
      348. <<<<<<< HEAD ======= <<<<<<< HEAD =======
      349. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
      350. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      351. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) =======
      352. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= =======
      353. 1 it '#categories_names' do
      354. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      355. end
      356. =======
      357. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> 8288136d (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 31d15e66 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix)
      358. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      359. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs)
      360. 1 =======
      361. =======
      362. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
      363. <<<<<<< HEAD
      364. =======
      365. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
      366. <<<<<<< HEAD
      367. end
      368. =======
      369. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      370. >>>>>>> bd8bda4 (Manifest_cache true) =======
      371. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      372. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      373. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      374. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      375. <<<<<<< HEAD ======= <<<<<<< HEAD
      376. ======= >>>>>>> 7375d4b (Manifest_cache true)
      377. end
      378. 1 it '#categories_names' do
      379. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      380. end
      381. ======= >>>>>>> c59d1a99 (Manifest_cache true) =======
      382. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      383. <<<<<<< HEAD
      384. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      385. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true)
      386. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      387. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
      388. >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      389. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      390. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      391. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      392. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= =======
      393. >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      394. >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
      395. ]
      396. end
      397. 1 let(:categories) do
      398. [
      399. 2 FactoryBot.create(:category, name: 'Poetry'),
      400. FactoryBot.create(:category, name: 'Novel')
      401. ]
      402. end
      403. 1 context 'when decorate' do
      404. 1 it '#authors_names' do
      405. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
      406. end
      407. 1 it '#categories_names' do
      408. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      409. end
      410. end
      411. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> e3e66f3 (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 160fb15 (Fix) >>>>>>> 67ab5299 (Fix) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      >>>>>>> c033601 (Rebased) =======
      >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= 15 relevant lines. 15 lines covered and >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      4. 1 <<<<<<< HEAD let(:book) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BookDecorator do
      5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs)
      7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs)
      8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
      10. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      11. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      14. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= categories_count: 0, ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= categories_count: 0, >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= categories_count: 0, ======= =======
      15. <<<<<<< HEAD
      16. =======
      17. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      19. =======
      20. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      22. <<<<<<< HEAD authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authors_count: 0) ======= ======= authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) authors_count: 0) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= authors_count: 0) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= authors_count: 0) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= authors_count: 0) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      23. <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      24. >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix)
      25. <<<<<<< HEAD ======= =======
      26. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      27. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      28. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      29. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      30. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      31. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      32. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix)
      33. <<<<<<< HEAD ======= =======
      34. 2 >>>>>>> 02a399d (Manifest_cache true) =======
      35. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      36. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD =======
      37. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      38. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      39. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= =======
      40. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      41. >>>>>>> ae2a012 (Manifest_cache true) =======
      42. 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      43. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) end ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= end >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= end >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      44. <<<<<<< HEAD
      45. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      46. 1 ======= =======
      47. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      48. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      49. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      50. =======
      51. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      52. >>>>>>> bd8bda4 (Manifest_cache true) =======
      53. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      54. >>>>>>> 183b6c5 (Manifest_cache true) =======
      55. >>>>>>> fd6db03 (Manifest_cache true) =======
      56. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      57. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      58. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:authors) do ======= ======= let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) let(:authors) do ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= let(:authors) do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= let(:authors) do >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      59. <<<<<<< HEAD
      60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      61. ======= =======
      62. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      63. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      64. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      65. >>>>>>> bd8bda4 (Manifest_cache true) =======
      66. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      67. >>>>>>> 183b6c5 (Manifest_cache true) =======
      68. >>>>>>> fd6db03 (Manifest_cache true) =======
      69. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      70. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      71. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      72. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) [
      73. <<<<<<< HEAD
      74. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs)
      75. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
      76. 3 ======= <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      77. =======
      78. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      79. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      80. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      81. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      82. <<<<<<< HEAD
      83. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      84. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true)
      85. ======= <<<<<<< HEAD <<<<<<< HEAD
      86. ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      87. ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      88. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD =======
      89. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      90. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      91. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      92. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ]
      94. <<<<<<< HEAD
      95. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      96. ======= =======
      97. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      98. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      99. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      100. >>>>>>> bd8bda4 (Manifest_cache true) =======
      101. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. >>>>>>> 183b6c5 (Manifest_cache true) =======
      103. >>>>>>> fd6db03 (Manifest_cache true) =======
      104. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      105. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      106. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      107. >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> 6da9530 (Featire specs)
      108. <<<<<<< HEAD
      109. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      110. ======= =======
      111. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      112. >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      113. >>>>>>> 2722d07 (Manifest_cache true) =======
      114. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      115. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      116. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      117. =======
      118. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      119. >>>>>>> bd8bda4 (Manifest_cache true) =======
      120. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      121. >>>>>>> 183b6c5 (Manifest_cache true) =======
      122. >>>>>>> fd6db03 (Manifest_cache true) =======
      123. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      124. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      125. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      126. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 let(:categories) do
      127. <<<<<<< HEAD
      128. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      129. ======= =======
      130. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      131. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      132. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      133. =======
      134. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      135. >>>>>>> bd8bda4 (Manifest_cache true) =======
      136. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      137. >>>>>>> 183b6c5 (Manifest_cache true) =======
      138. >>>>>>> fd6db03 (Manifest_cache true) =======
      139. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      140. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      141. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      142. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) [
      143. <<<<<<< HEAD
      144. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      145. 3 ======= =======
      146. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      147. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      148. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      149. =======
      150. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) =======
      151. 2 >>>>>>> bd8bda4 (Manifest_cache true) =======
      152. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      153. 2 >>>>>>> 183b6c5 (Manifest_cache true) =======
      154. 2 >>>>>>> fd6db03 (Manifest_cache true) =======
      155. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      156. 3 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      157. 3 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre), ======= ======= create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      158. <<<<<<< HEAD
      159. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      160. ======= =======
      161. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      162. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      163. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      164. =======
      165. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      166. >>>>>>> bd8bda4 (Manifest_cache true) =======
      167. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      168. >>>>>>> 183b6c5 (Manifest_cache true) =======
      169. >>>>>>> fd6db03 (Manifest_cache true) =======
      170. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      171. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      172. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      173. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:category, name: FFaker::Book.genre) ======= ======= create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      174. <<<<<<< HEAD
      175. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      176. ======= =======
      177. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      178. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      179. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      180. =======
      181. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      182. >>>>>>> bd8bda4 (Manifest_cache true) =======
      183. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      184. >>>>>>> 183b6c5 (Manifest_cache true) =======
      185. >>>>>>> fd6db03 (Manifest_cache true) =======
      186. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      187. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      188. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      189. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ]
      190. <<<<<<< HEAD
      191. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      192. ======= =======
      193. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
      194. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      195. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      196. =======
      197. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
      198. >>>>>>> bd8bda4 (Manifest_cache true) =======
      199. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      200. >>>>>>> 183b6c5 (Manifest_cache true) =======
      201. >>>>>>> fd6db03 (Manifest_cache true) =======
      202. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      203. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      204. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      205. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      206. <<<<<<< HEAD
      207. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      208. ======= =======
      209. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true)
      210. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= =======
      211. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      212. ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      213. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
      214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
      215. >>>>>>> 02a399d (Manifest_cache true) =======
      216. >>>>>>> bd8bda4 (Manifest_cache true) =======
      217. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      218. >>>>>>> 183b6c5 (Manifest_cache true) =======
      219. >>>>>>> fd6db03 (Manifest_cache true) =======
      220. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      221. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      222. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      223. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      224. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      225. <<<<<<< HEAD
      226. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      227. ======= =======
      228. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true)
      229. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      230. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      231. >>>>>>> bd8bda4 (Manifest_cache true) =======
      232. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      233. >>>>>>> 183b6c5 (Manifest_cache true) =======
      234. >>>>>>> fd6db03 (Manifest_cache true) =======
      235. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      236. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      237. >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      238. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#categories_names' do ======= ======= describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= describe '#categories_names' do >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= describe '#categories_names' do >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      239. <<<<<<< HEAD
      240. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      241. 2 ======= =======
      242. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true)
      243. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      244. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      245. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
      246. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      247. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
      248. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
      249. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      250. 2 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      251. 2 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      252. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      253. ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      254. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      255. 1 <<<<<<< HEAD ======= =======
      256. =======
      257. =======
      258. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= =======
      259. 1 >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
      260. <<<<<<< HEAD <<<<<<< HEAD
      261. ======= <<<<<<< HEAD
      262. =======
      263. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
      264. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
      265. <<<<<<< HEAD
      266. <<<<<<< HEAD =======
      267. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
      268. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      269. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      270. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= =======
      271. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= end >>>>>>> ef483b6d (Fix)
      272. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
      273. 1 it '#categories_names' do
      274. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      275. ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) end
      276. =======
      277. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) >>>>>>> ae884b47 (Fix) end ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 67ab5299 (Fix) ======= end >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      278. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      279. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      280. 1 =======
      281. =======
      282. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
      283. <<<<<<< HEAD
      284. =======
      285. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
      286. <<<<<<< HEAD
      287. end
      288. =======
      289. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      290. >>>>>>> bd8bda4 (Manifest_cache true) =======
      291. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) end
      292. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true)
      293. =======
      294. >>>>>>> 02a399d (Manifest_cache true) =======
      295. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      296. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) =======
      297. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      298. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      299. <<<<<<< HEAD
      300. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix)
      301. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      302. =======
      303. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
      304. >>>>>>> fd6db03 (Manifest_cache true) =======
      305. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      306. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) =======
      307. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD
      308. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      309. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      310. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      311. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d9d85ca6 (Fix) describe '#authors_names' do
      312. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      313. =======
      314. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      315. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true)
      316. <<<<<<< HEAD
      317. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      318. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD
      319. =======
      320. >>>>>>> 02a399d (Manifest_cache true) =======
      321. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      322. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      323. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) =======
      324. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      325. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      326. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 1 <<<<<<< HEAD it { ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      327. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      328. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      329. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 67ab5299 (Fix)
      330. <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      331. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true)
      332. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      333. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD end
      334. ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      335. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 21793167 (Manifest_cache true)
      336. 1 =======
      337. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      338. <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 21793167 (Manifest_cache true)
      339. 1 <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
      340. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      341. ======= ======= >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price)
      342. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      343. end
      344. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      345. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      346. >>>>>>> bd8bda4 (Manifest_cache true) =======
      347. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= =======
      348. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= =======
      349. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      350. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) end
      351. <<<<<<< HEAD
      352. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      354. =======
      355. >>>>>>> 02a399d (Manifest_cache true) =======
      356. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      357. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      358. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) =======
      359. >>>>>>> 6da9530 (Featire specs)
      360. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 557c1b8 (Fix)
      361. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      362. =======
      363. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4367ccb1 (Manifest_cache true) =======
      364. >>>>>>> fd6db03 (Manifest_cache true) =======
      365. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      366. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      367. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD
      368. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      369. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      370. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      371. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      372. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 describe '#authors_names' do
      373. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      374. =======
      375. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
      376. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) =======
      377. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= describe '#authors_names' do ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= describe '#authors_names' do >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= it { >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      378. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
      379. ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true)
      380. =======
      381. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= =======
      382. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      383. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= =======
      384. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) =======
      385. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      386. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      387. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= it { ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= it { >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= it { >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix)
      388. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      389. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      390. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true)
      391. ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> bf137e4 (Manifest_cache true)
      392. ======= <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true)
      393. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      394. <<<<<<< HEAD <<<<<<< HEAD end
      395. ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      396. <<<<<<< HEAD <<<<<<< HEAD =======
      397. 1 =======
      398. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      399. >>>>>>> 1c3ace6 (Manifest_cache true)
      400. 1 <<<<<<< HEAD <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      401. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      402. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      403. end
      404. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      405. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      406. >>>>>>> bd8bda4 (Manifest_cache true) =======
      407. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= =======
      408. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= =======
      409. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      410. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) end
      411. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
      412. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      413. =======
      414. >>>>>>> 02a399d (Manifest_cache true)
      415. <<<<<<< HEAD
      416. =======
      417. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true)
      418. <<<<<<< HEAD
      419. =======
      420. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true)
      421. <<<<<<< HEAD
      422. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      423. ======= >>>>>>> 7375d4b (Manifest_cache true)
      424. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
      425. 1 it '#categories_names' do
      426. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
      427. end
      428. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      429. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= =======
      430. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      431. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      432. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      433. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= =======
      434. >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= =======
      435. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= =======
      436. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      437. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      438. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
      439. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) "#{authors.last.first_name} #{authors.last.last_name}")
      440. }
      441. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) =======
      442. >>>>>>> 02a399d (Manifest_cache true) =======
      443. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      444. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      445. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      446. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      447. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      448. 1 describe '#price' do
      449. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
      450. end
      451. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c8da2e3 (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 5b7749a (Fix) =======
      452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= =======
      453. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      454. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      455. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      456. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      457. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) =======
      458. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true)
      459. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      461. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= =======
      462. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      463. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      464. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
      465. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======
      466. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      467. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      468. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      469. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      470. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      471. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      472. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
      473. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      474. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      475. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      476. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      477. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      478. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      479. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= =======
      480. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/addresses.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :address do
      3. end
      4. end

      spec/factories/admin_users.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true)

      spec/factories/authors.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/authors.rb

      <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= =======

      spec/factories/authors.rb

      <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/authors.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs)
      ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      >>>>>>> 9bfbd88 (Featire specs)

      spec/decorators/book_decorator_spec.rb

      100.0% lines covered

      15 relevant lines. 15 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BookDecorator do
      2. 4 subject(:decorated_object) { described_class.new(book) }
      3. 1 let(:book) do
      4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
      5. categories_count: 0,
      6. authors_count: 0)
      7. end
      8. 1 let(:authors) do
      9. [
      10. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
      11. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
      12. ]
      13. end
      14. 1 let(:categories) do
      15. [
      16. 3 create(:category, name: FFaker::Book.genre),
      17. create(:category, name: FFaker::Book.genre)
      18. ]
      19. end
      20. 1 describe '#categories_names' do
      21. 2 it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") }
      22. end
      23. 1 describe '#authors_names' do
      24. 1 it {
      25. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
      26. "#{authors.last.first_name} #{authors.last.last_name}")
      27. }
      28. end
      29. 1 describe '#price' do
      30. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
      31. end
      32. end

      spec/factories/addresses.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :address do
      3. end
      4. end

      spec/factories/admin_users.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true)

      spec/factories/authors.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/authors.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/authors.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) factory :admin_user do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) factory :admin_user do ======= factory :author do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= factory :admin_user do >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 0d6dd12 (Manifest_cache true) ======= factory :author do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= factory :author do >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= factory :admin_user do >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= factory :admin_user do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= factory :admin_user do >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= factory :author do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= factory :author do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 0d6dd12 (Manifest_cache true) ======= factory :author do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= factory :author do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= factory :admin_user do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= factory :author do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= factory :author do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= factory :author do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= factory :admin_user do >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      4. 13 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs)
      5. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 13 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      8. 1 >>>>>>> 752f0c0 (Featire specs) =======
      9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      12. 1 >>>>>>> 75fa7e1b (Rebased) =======
      13. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs)
      14. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      15. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
      16. 13 =======
      17. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      18. 15 =======
      19. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      20. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      21. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      22. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      23. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      24. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      25. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
      26. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      27. 15 =======
      28. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      29. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
      30. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      31. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      32. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      33. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      34. 1 >>>>>>> 11792758 (Rebased) =======
      35. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      36. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      37. 15 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
      38. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      39. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      40. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      41. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      42. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      43. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
      44. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      45. 15 =======
      46. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      47. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      48. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) email { FFaker::Internet.email } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) email { FFaker::Internet.email } ======= first_name { FFaker::Name.first_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= first_name { FFaker::Name.first_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= email { FFaker::Internet.email } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= email { FFaker::Internet.email } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= email { FFaker::Internet.email } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= first_name { FFaker::Name.first_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= first_name { FFaker::Name.first_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= email { FFaker::Internet.email } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= first_name { FFaker::Name.first_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= email { FFaker::Internet.email } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      50. 13 ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs)
      51. 15 >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
      52. 13 =======
      53. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      54. 1 >>>>>>> 752f0c0 (Featire specs) =======
      55. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      56. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      57. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      58. 1 >>>>>>> 75fa7e1b (Rebased) =======
      59. 15 >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
      60. 15 ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      61. 15 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      62. 13 =======
      63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs)
      64. 15 =======
      65. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      66. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      67. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      68. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      69. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      70. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      71. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= =======
      72. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      73. 15 =======
      74. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      75. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= =======
      76. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      77. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      78. 15 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      79. 13 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      80. 1 >>>>>>> 11792758 (Rebased) =======
      81. 15 >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      82. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      83. 15 >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) =======
      84. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      85. 15 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      86. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      87. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      88. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      89. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= =======
      90. 15 >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      91. 15 =======
      92. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      93. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      94. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) password { 'adminPassword' } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) password { 'adminPassword' } ======= last_name { FFaker::Name.last_name } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= password { 'adminPassword' } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= last_name { FFaker::Name.last_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= password { 'adminPassword' } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= password { 'adminPassword' } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= password { 'adminPassword' } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 0d6dd12 (Manifest_cache true) ======= last_name { FFaker::Name.last_name } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= last_name { FFaker::Name.last_name } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= password { 'adminPassword' } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= last_name { FFaker::Name.last_name } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= password { 'adminPassword' } >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      95. end
      96. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/authors.rb

      80.0% lines covered

      10 relevant lines. 8 lines covered and 2 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :author do
      3. 5 first_name { FFaker::Name.first_name }
      4. 5 last_name { FFaker::Name.last_name }
      5. 1 transient do
      6. 1 books_count { 1 }
      7. end
      8. 1 after :create do |author, books_count|
      9. 10 author.books do
      10. Array.new(books_count) do
      11. association(:author, books: [instance])
      12. end
      13. end
      14. end
      15. end
      16. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/authors_books.rb

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :authors_book do
      3. 1 author
      4. 1 book
      5. end
      6. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)

      spec/factories/billings.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/billings.rb

      =======

      spec/factories/books.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

      spec/factories/billings.rb

      >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

      spec/factories/books.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/books.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/factories/billings.rb

      >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======

      spec/factories/billings.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/billings.rb

      >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======

      spec/factories/billings.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/books.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :billing do ======= ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) factory :billing do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      4. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      5. 1 =======
      6. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      7. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      8. 82 =======
      9. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      10. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      11. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      12. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      15. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      16. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      18. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      19. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      20. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      21. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      22. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      24. 1 =======
      25. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      26. 82 =======
      27. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      28. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      29. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      30. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      31. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      32. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      33. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      34. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      35. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      36. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      37. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) user
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      39. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      40. 1 =======
      41. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      42. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      43. 92 =======
      44. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      45. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      46. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      47. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      48. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      49. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      50. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      51. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      52. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      53. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      54. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      55. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      56. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      57. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      58. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      59. 1 =======
      60. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      61. 92 =======
      62. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      64. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      66. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      67. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      68. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      69. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      70. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      71. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      72. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) address { FFaker::AddressUA.street_address }
      73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      74. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      75. 1 =======
      76. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      77. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      78. 82 =======
      79. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      80. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      81. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      82. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      83. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      84. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      85. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      86. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      87. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      88. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      89. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      90. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      91. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      92. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      93. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      94. 1 =======
      95. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      96. 82 =======
      97. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      98. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      99. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      100. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      101. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      102. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      103. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      104. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      105. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      106. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      107. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) city { FFaker::AddressUA.city }
      108. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      109. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      110. 1 =======
      111. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      112. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      113. 92 =======
      114. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      115. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      116. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      117. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      118. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      119. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      120. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      121. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      122. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      123. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      124. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      125. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      126. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      127. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      128. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      129. 1 =======
      130. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      131. 92 =======
      132. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      133. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      134. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      135. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      136. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      137. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      138. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      139. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      140. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      141. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      142. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) zip { FFaker::AddressUA.zip_code }
      143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      144. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      145. 1 =======
      146. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      147. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      148. 92 =======
      149. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      150. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      151. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      152. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      153. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      154. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      155. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      156. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      157. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      158. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      159. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      160. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      161. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      162. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      163. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      164. 1 =======
      165. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      166. 92 =======
      167. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      168. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      169. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      170. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      171. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      172. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      173. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      174. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      175. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      176. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      177. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) country { FFaker::AddressUA.country }
      178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      179. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      180. 1 =======
      181. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      182. 3 ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs)
      183. 92 =======
      184. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      185. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) =======
      186. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      187. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      188. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      189. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      190. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      191. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      192. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true)
      193. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      194. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      195. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      196. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      197. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= =======
      198. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      199. 1 =======
      200. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      201. 92 =======
      202. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      203. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      204. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      205. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      206. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      207. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      208. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      209. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      210. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= =======
      211. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      212. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) phone { FFaker::PhoneNumberUA.home_phone_number }
      213. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      214. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      215. =======
      216. 3 ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      217. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      218. =======
      219. 3 ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)
      220. 92 =======
      221. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      222. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      223. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      224. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      225. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      226. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      227. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      228. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true)
      229. 90 >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true)
      230. 3 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD
      231. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      232. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      233. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true)
      234. =======
      235. 3 <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      236. 92 =======
      237. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      239. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      240. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      241. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      242. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      243. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= =======
      244. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      245. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      246. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) =======
      247. >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= =======
      248. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      249. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= =======
      250. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      251. end

      spec/factories/books.rb

      80.95% lines covered

      21 relevant lines. 17 lines covered and 4 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) factory :book do >>>>>>> c7a726c5 (Rebased)
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      4. 95 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      6. 1 =======
      7. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      8. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      9. 82 =======
      10. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      11. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      12. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      13. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      14. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      15. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      17. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      19. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      21. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      22. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      23. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      24. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 =======
      26. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. 82 =======
      28. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      29. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      30. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      31. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      32. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      33. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      34. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      35. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      36. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      37. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      38. 95 >>>>>>> c7a726c5 (Rebased) =======
      39. 95 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      40. 3 ======= <<<<<<< HEAD
      41. 82 =======
      42. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      43. 80 >>>>>>> 752f0c0 (Featire specs) =======
      44. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      45. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      46. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      47. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      48. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      49. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      50. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      51. 95 =======
      52. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      53. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      54. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      55. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      56. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      57. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      58. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      59. 97 =======
      60. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      61. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      62. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      64. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      65. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      66. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) user
      67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      68. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      69. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      70. 1 =======
      71. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      72. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      73. 92 =======
      74. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      75. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      76. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      77. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      78. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      79. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      80. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      81. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      82. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      83. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      84. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      85. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      86. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      87. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      88. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      89. 1 =======
      90. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      91. 92 =======
      92. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      93. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      94. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      95. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      96. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      97. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      98. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      99. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      100. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      101. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      102. 109 >>>>>>> c7a726c5 (Rebased) =======
      103. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      104. 3 ======= <<<<<<< HEAD
      105. 92 =======
      106. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      107. 90 >>>>>>> 752f0c0 (Featire specs) =======
      108. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      109. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      110. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      111. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      112. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      113. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      114. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      115. 109 =======
      116. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      117. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      118. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      119. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      120. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      121. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      122. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      123. 111 =======
      124. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      125. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      126. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      127. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      128. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      129. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      130. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) address { FFaker::AddressUA.street_address }
      131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      132. 92 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      133. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      134. 1 =======
      135. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      136. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      137. 82 =======
      138. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      139. 80 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      140. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      141. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      142. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      143. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      144. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      145. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      146. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      147. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      148. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      149. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      150. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      151. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      152. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      153. 1 =======
      154. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      155. 82 =======
      156. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      157. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      158. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      159. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      160. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      161. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      162. 82 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      163. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      164. 82 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      165. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      166. 92 >>>>>>> c7a726c5 (Rebased) =======
      167. 92 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      168. 3 ======= <<<<<<< HEAD
      169. 82 =======
      170. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      171. 80 >>>>>>> 752f0c0 (Featire specs) =======
      172. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      173. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      174. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      175. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      176. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      177. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      178. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      179. 92 =======
      180. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      181. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      182. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      183. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      184. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      185. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      186. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      187. 94 =======
      188. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      189. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      190. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      191. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      192. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      193. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      194. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD city { FFaker::AddressUA.city } ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 0d6dd12 (Manifest_cache true) ======= price { FFaker::Number.rand(100) } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      195. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      196. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      197. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      198. 1 =======
      199. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      200. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      201. 92 =======
      202. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      203. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      204. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      205. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      206. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      207. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      208. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      209. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      210. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      211. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      212. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      213. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      214. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      215. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      216. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      217. 1 =======
      218. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      219. 92 =======
      220. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      221. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      222. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      223. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      224. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      225. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      226. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      227. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      228. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      229. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      230. 109 >>>>>>> c7a726c5 (Rebased) =======
      231. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      232. 3 ======= <<<<<<< HEAD
      233. 92 =======
      234. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      235. 90 >>>>>>> 752f0c0 (Featire specs) =======
      236. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      237. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      238. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      239. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      240. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      241. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      242. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      243. 109 =======
      244. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      245. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      246. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      247. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      248. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      249. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      250. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      251. 111 =======
      252. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      253. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      254. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      255. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      256. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      257. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      258. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) zip { FFaker::AddressUA.zip_code }
      259. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      260. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      261. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      262. 1 =======
      263. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      264. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      265. 92 =======
      266. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      267. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      268. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      269. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      270. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      271. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      272. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      273. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      274. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      275. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      276. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      277. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      278. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      279. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      280. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      281. 1 =======
      282. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      283. 92 =======
      284. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      285. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      286. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      287. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      288. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      289. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      290. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      291. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      292. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      293. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      294. 109 >>>>>>> c7a726c5 (Rebased) =======
      295. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      296. 3 ======= <<<<<<< HEAD
      297. 92 =======
      298. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      299. 90 >>>>>>> 752f0c0 (Featire specs) =======
      300. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      301. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      302. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      303. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      304. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      305. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      306. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      307. 109 =======
      308. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      309. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      310. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      311. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      312. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      313. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      314. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      315. 111 =======
      316. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      317. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      318. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      319. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      320. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      321. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      322. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) country { FFaker::AddressUA.country }
      323. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      324. 109 ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      325. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      326. 1 =======
      327. 3 >>>>>>> 02a399d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      328. 3 ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs)
      329. 92 =======
      330. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      331. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) =======
      332. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      333. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      334. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      335. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      336. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      337. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      338. 1 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 251144b4 (Manifest_cache true)
      339. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      340. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      341. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      342. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      343. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= =======
      344. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      345. 1 =======
      346. 3 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      347. 92 =======
      348. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      349. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      350. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      351. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      352. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      353. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      354. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      355. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      356. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= =======
      357. 1 >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      358. 109 >>>>>>> c7a726c5 (Rebased) =======
      359. 109 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      360. 3 ======= <<<<<<< HEAD
      361. 92 =======
      362. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      363. 90 >>>>>>> 752f0c0 (Featire specs) =======
      364. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      365. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      366. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      367. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      368. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      369. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      370. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs)
      371. 109 =======
      372. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      373. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      374. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      375. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      376. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      377. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      378. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      379. 111 =======
      380. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      381. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      382. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      383. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      384. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      385. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      386. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) phone { FFaker::PhoneNumberUA.home_phone_number }
      387. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 21793167 (Manifest_cache true) ======= >>>>>>> d245196f (Manifest_cache true) ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 9c626020 (Fix book_spec decrease quantity and price)
      388. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      389. =======
      390. 3 ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      391. 3 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      392. =======
      393. 3 ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
      394. 92 =======
      395. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= =======
      396. 90 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      397. 3 >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      398. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      399. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      400. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      401. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
      402. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true)
      403. 90 >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true)
      404. 3 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD
      405. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      406. 3 <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) =======
      407. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true)
      408. =======
      409. 3 <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      410. 92 =======
      411. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      412. 3 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      413. 3 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      414. 3 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      415. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      416. 3 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      417. 92 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= =======
      418. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      419. 92 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) =======
      420. 109 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      421. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      422. 3 ======= <<<<<<< HEAD
      423. 92 =======
      424. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      425. 90 >>>>>>> 752f0c0 (Featire specs) =======
      426. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      427. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      428. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      429. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
      430. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      431. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      432. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      433. 109 =======
      434. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      435. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      436. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      437. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
      438. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      439. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      440. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      441. 111 =======
      442. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      443. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      444. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      445. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      446. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      447. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      448. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 610b6138 (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= >>>>>>> ebcdce06 (Featire specs) quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84003439 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) quantity { FFaker::Number.rand(2..10) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      449. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) =======
      450. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 0341d6de (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= =======
      451. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= =======
      452. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      453. 1 transient do
      454. 1 categories_count { 1 }
      455. end
      456. 1 transient do
      457. 1 authors_count { 1 }
      458. end
      459. 1 after :create do |book, authors_count|
      460. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      461. 110 =======
      462. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      463. 108 =======
      464. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      465. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      466. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      467. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      468. 110 >>>>>>> e3e66f3 (Featire specs) =======
      469. 118 >>>>>>> 5b7749a (Fix) =======
      470. 108 >>>>>>> 6da9530 (Featire specs) book.authors do
      471. Array.new(authors_count) do
      472. association(:book, authors: [instance])
      473. end
      474. end
      475. end
      476. 1 after :create do |book, categories_count|
      477. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      478. 110 =======
      479. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      480. 108 =======
      481. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      482. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      483. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      484. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      485. 110 >>>>>>> e3e66f3 (Featire specs) =======
      486. 118 >>>>>>> 5b7749a (Fix) =======
      487. 108 >>>>>>> 6da9530 (Featire specs) book.categories do
      488. Array.new(categories_count) do
      489. association(:book, categories: [instance])
      490. end
      491. end
      492. end
      493. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      494. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      495. =======
      496. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
      497. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      498. =======
      499. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      500. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      501. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      502. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      503. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      504. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      505. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      506. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      507. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      508. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      509. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      510. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      511. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= =======
      512. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/books.rb

      80.95% lines covered

      21 relevant lines. 17 lines covered and 4 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) factory :book do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      4. 95 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      5. 3 ======= <<<<<<< HEAD
      6. 82 =======
      7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      8. 80 >>>>>>> 752f0c0 (Featire specs) =======
      9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      10. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      11. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      12. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      16. 95 =======
      17. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      18. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      19. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      20. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      21. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      23. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      24. 97 =======
      25. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      26. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      27. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      29. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      30. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      31. 105 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) title { FFaker::Book.title }
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      33. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      34. 3 ======= <<<<<<< HEAD
      35. 92 =======
      36. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      37. 90 >>>>>>> 752f0c0 (Featire specs) =======
      38. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      39. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      41. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      42. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      43. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      45. 109 =======
      46. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      47. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      48. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      49. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      51. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      52. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      53. 111 =======
      54. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      55. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      56. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      57. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      58. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      59. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      60. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) description { FFaker::Book.description }
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      62. 92 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      63. 3 ======= <<<<<<< HEAD
      64. 82 =======
      65. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      66. 80 >>>>>>> 752f0c0 (Featire specs) =======
      67. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      68. 80 >>>>>>> 4e81ea2 (Featire specs) =======
      69. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      70. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      72. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      73. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      74. 92 =======
      75. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      76. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      77. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      79. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      80. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      81. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      82. 94 =======
      83. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      84. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      85. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      87. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      88. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      89. 98 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price_cents { FFaker::Number.rand(10_000) } ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 0d6dd12 (Manifest_cache true) ======= price { FFaker::Number.rand(100) } >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      91. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      92. 3 ======= <<<<<<< HEAD
      93. 92 =======
      94. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      95. 90 >>>>>>> 752f0c0 (Featire specs) =======
      96. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      97. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      98. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      99. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      100. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      101. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      103. 109 =======
      104. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      105. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      106. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      107. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      108. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      109. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      110. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      111. 111 =======
      112. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      113. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      114. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      115. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      116. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      117. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      118. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) materials { FFaker::Book.cover(:format) }
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      120. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      121. 3 ======= <<<<<<< HEAD
      122. 92 =======
      123. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      124. 90 >>>>>>> 752f0c0 (Featire specs) =======
      125. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      126. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      127. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      128. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      129. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      130. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      131. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      132. 109 =======
      133. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      134. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      135. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      136. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      137. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      138. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      139. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      140. 111 =======
      141. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      142. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      143. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      144. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      145. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      146. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      147. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) year_of_publication { FFaker::Number.rand(1900..2022) }
      148. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      149. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      150. 3 ======= <<<<<<< HEAD
      151. 92 =======
      152. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      153. 90 >>>>>>> 752f0c0 (Featire specs) =======
      154. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      155. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      156. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      157. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      158. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      159. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      160. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      161. 109 =======
      162. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      163. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      164. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      165. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      166. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      167. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      168. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      169. 111 =======
      170. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      171. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      172. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      173. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      174. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      175. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      176. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) dimensions { FFaker::Book.cover(:size) }
      177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      178. 109 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> ae884b47 (Fix) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      179. 3 ======= <<<<<<< HEAD
      180. 92 =======
      181. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      182. 90 >>>>>>> 752f0c0 (Featire specs) =======
      183. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
      184. 90 >>>>>>> 4e81ea2 (Featire specs) =======
      185. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
      186. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= =======
      187. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
      188. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      189. 109 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      190. 109 =======
      191. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      192. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      193. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      194. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
      195. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      196. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      197. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      198. 111 =======
      199. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      200. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      201. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      202. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      203. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      204. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      205. 119 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6e923b9d (Featire specs) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      206. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      207. 1 transient do
      208. 1 categories_count { 1 }
      209. end
      210. 1 transient do
      211. 1 authors_count { 1 }
      212. end
      213. 1 after :create do |book, authors_count|
      214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      215. 110 =======
      216. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      217. 108 =======
      218. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      219. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      220. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      221. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      222. 110 >>>>>>> e3e66f3 (Featire specs) =======
      223. 118 >>>>>>> 5b7749a (Fix) book.authors do
      224. Array.new(authors_count) do
      225. association(:book, authors: [instance])
      226. end
      227. end
      228. end
      229. 1 after :create do |book, categories_count|
      230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      231. 110 =======
      232. 108 >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 557c1b8 (Fix)
      233. 108 =======
      234. 110 >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= =======
      235. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= =======
      236. 110 >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) =======
      237. 110 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      238. 110 >>>>>>> e3e66f3 (Featire specs) =======
      239. 118 >>>>>>> 5b7749a (Fix) book.categories do
      240. Array.new(categories_count) do
      241. association(:book, categories: [instance])
      242. end
      243. end
      244. end
      245. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) end
      246. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
      247. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      248. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
      249. =======
      250. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      251. >>>>>>> 752f0c0 (Featire specs) =======
      252. >>>>>>> 4e81ea2 (Featire specs) =======
      253. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      254. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      255. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      257. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      258. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      259. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      260. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      261. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      263. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      264. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      265. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      266. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      267. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      268. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      269. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      270. >>>>>>> 11792758 (Rebased) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)

      spec/factories/books_categories.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/factories/books_categories.rb

      =======

      spec/factories/books_category.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======

      spec/factories/books_categories.rb

      >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs)

      spec/factories/books_category.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======

      spec/factories/books_category.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======

      spec/factories/books_categories.rb

      >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======

      spec/factories/books_categories.rb

      >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/factories/books_categories.rb

      >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/factories/books_category.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======

      spec/factories/books_categories.rb

      >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======

      spec/factories/books_category.rb

      >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      100.0% lines covered

      4 relevant lines. 4 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :books_category do
      3. 1 book
      4. 1 category
      5. end
      6. end

      spec/factories/categories.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :category do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      4. 12 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 251144b4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      5. 12 >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      6. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      7. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
      8. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======
      9. 12 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
      10. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      11. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
      12. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      13. 1 ======= <<<<<<< HEAD
      14. 8 =======
      15. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      16. 8 >>>>>>> 752f0c0 (Featire specs) =======
      17. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
      18. 8 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) =======
      19. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      20. 8 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      21. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      22. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs)
      23. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      24. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      25. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      26. 12 =======
      27. 12 >>>>>>> 9620751 (Featire specs) ======= =======
      28. 12 >>>>>>> 6da9530 (Featire specs) =======
      29. 8 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) =======
      30. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
      31. 8 =======
      32. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      33. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      34. 1 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      35. 8 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      36. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      37. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      38. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      39. 12 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      40. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      41. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      42. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      43. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      45. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      46. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      47. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      48. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      49. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      50. 12 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      51. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      52. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      53. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      54. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      55. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      56. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      57. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      58. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      59. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      60. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) name { FFaker::Book.genre }
      61. end
      62. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f6e20266 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed8ea634 (Add login registration pages) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2be0d057 (Add login registration pages) ======= >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 385b8df (Manifest_cache true) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= >>>>>>> adc21e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 4d90e3d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> c5efe8e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= >>>>>>> aa3618b (Rebased) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)

      spec/factories/reviews.rb

      ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) =======
      ======= ======= >>>>>>> bae2b7de (Add login registration pages)

      spec/factories/users.rb

      ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 6da9530 (Featire specs)

      spec/factories/reviews.rb

      >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD =======

      spec/factories/users.rb

      ======= <<<<<<< HEAD ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
      =======
      >>>>>>> 7c4ea7f (Fix)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      =======

      spec/factories/coupons.rb

      >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 6 relevant lines. 6 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :coupon do
      3. 4 code { SecureRandom.hex }
      4. 4 is_active { true }
      5. 4 active_till_date { FFaker::Time.datetime }
      6. 1 discount { rand(0..50) / 100 }
      7. end
      8. end

      spec/factories/order_books.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      7. end
      8. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
      5. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      6. end
      7. end
      >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs)

      spec/feature/book_spec.rb

      <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) 5 relevant lines. 5 lines covered and ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= FactoryBot.define do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      3. 1 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD factory :user do
      16. end
      17. end
      >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD =======

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= factory :order_book do >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= order >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
      11. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      12. 1 =======
      13. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      14. 5 >>>>>>> 752f0c0 (Featire specs) =======
      15. 5 >>>>>>> 4e81ea2 (Featire specs) =======
      16. 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      17. 5 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      18. 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      19. 5 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      20. 5 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      21. 5 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      22. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= book
      23. 5 quantity { 1 }
      24. end
      25. end

      spec/factories/orders.rb

      77.78% lines covered

      9 relevant lines. 7 lines covered and 2 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :order do
      3. 5 status { 'created' }
      4. 1 transient do
      5. 1 books_count { 1 }
      6. end
      7. 1 after :create do |order, books_count|
      8. 4 order.books do
      9. Array.new(books_count) do
      10. association(:order, books: [instance])
      11. end
      12. end
      13. end
      14. end
      15. end

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. ======= >>>>>>> 6da9530 (Featire specs)
      5. 1 rating { FFaker::Number.rand(0..5) } <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      8. 1 =======
      9. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      10. 3 >>>>>>> 752f0c0 (Featire specs) =======
      11. 3 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      14. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      15. 3 >>>>>>> 7a02bbe (Featire specs) =======
      16. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      17. 3 >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
      19. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) body { FFaker::Lorem.words(500) }
      20. end
      21. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 13 email { FFaker::Internet.email }
      4. 20 password { 'password' }
      5. 20 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. 1 rating { FFaker::Number.rand(0..5) }
      5. 1 body { FFaker::Lorem.words(500) }
      6. end
      7. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased)

      spec/factories/users.rb

      <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

      spec/factories/reviews.rb

      ======= <<<<<<< HEAD =======

      spec/factories/users.rb

      ======= <<<<<<< HEAD ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD

      spec/factories/reviews.rb

      <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> bae2b7de (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)
      =======
      >>>>>>> 7c4ea7f (Fix)
      <<<<<<< HEAD

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 7375d4b (Manifest_cache true) =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======

      spec/factories/users.rb

      ======= =======

      spec/factories/users.rb

      <<<<<<< HEAD =======

      spec/factories/coupons.rb

      >>>>>>> 5b7749a (Fix) ======= ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased)

      spec/factories/reviews.rb

      >>>>>>> 11792758 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :coupon do
      3. 4 code { SecureRandom.hex }
      4. 4 is_active { true }
      5. 4 active_till_date { FFaker::Time.datetime }
      6. 1 discount { rand(0..50) / 100 }
      7. end
      8. end

      spec/factories/order_books.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 4552227 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= 2 relevant lines. 2 lines covered and >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 11792758 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :user do
      7. end
      8. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) FactoryBot.define do
      2. 1 <<<<<<< HEAD factory :user do
      3. end
      4. end
      <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e5752db (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 11792758 (Rebased)
      11. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 11792758 (Rebased)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 11792758 (Rebased)
      13. 1 rating { FFaker::Number.rand(0..5) }
      14. 1 body { FFaker::Lorem.words(500) }
      15. end
      16. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) factory :user do
      3. <<<<<<< HEAD <<<<<<< HEAD
      4. =======
      5. 1 =======
      6. 13 >>>>>>> 31d15e66 (Fix) email { FFaker::Internet.email }
      7. 20 password { 'password' }
      8. 20 confirmed_at { Time.zone.now }
      9. >>>>>>> 11792758 (Rebased) end
      10. <<<<<<< HEAD
      11. =======
      12. >>>>>>> 11792758 (Rebased) end
      <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> e3e66f3 (Featire specs)

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> fc3774fd (Featire specs) 5 relevant lines. 5 lines covered and ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) 5 relevant lines. 5 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) FactoryBot.define do ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.define do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.define do >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= FactoryBot.define do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      3. 1 ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
      12. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD factory :user do
      16. end
      17. end
      >>>>>>> e1f4d17 (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> 7a02bbe (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 105 relevant lines. 105 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 105 relevant lines. 105 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do
      2. 1 factory :user do
      3. end
      4. end
      >>>>>>> 730a8ca (Add login registration pages)

      spec/feature/book_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8249ff3c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      >>>>>>> c033601 (Rebased)

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) =======

      =======

      spec/feature/admin/author_spec.rb

      >>>>>>> e3e66f3 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) ======= 31 relevant lines. 31 lines covered and >>>>>>> e3e66f3 (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> e3e66f3 (Featire specs)
      2. 1 <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased) ======= include_context 'with api request authentication helper methods' >>>>>>> e3e66f3 (Featire specs)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      5. 1 =======
      6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 5 >>>>>>> 752f0c0 (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 1 =======
      11. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 3 >>>>>>> 752f0c0 (Featire specs) =======
      13. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) body { FFaker::Lorem.words(500) }
      14. end
      15. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased)

      spec/factories/users.rb

      >>>>>>> 11792758 (Rebased)

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 17 email { FFaker::Internet.email }
      4. 24 password { 'password' }
      5. 24 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages)
      =======
      >>>>>>> aca90e3 (Rebased)
      <<<<<<< HEAD

      spec/feature/book_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/feature/book_spec.rb

      >>>>>>> 08edf50 (Featire specs) =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)

      =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75fa7e1b (Rebased) 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> c7a726c5 (Rebased)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> 75fa7e1b (Rebased) =======
      12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= factory :review do >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD factory :review do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= factory :review do >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= factory :order_book do >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request authentication helper methods' >>>>>>> c7a726c5 (Rebased)
      13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= title { FFaker::Lorem.words(5) } >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) title { FFaker::Lorem.words(5) } ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) title { FFaker::Lorem.words(5) } ======= RSpec.describe 'Books', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= order >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
      14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs)
      15. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      16. 1 =======
      17. ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true)
      18. 2 let(:first_name) { FFaker::Name.first_name }
      19. 2 let(:last_name) { FFaker::Name.last_name }
      20. 2 let(:new_name) { FFaker::Name.first_name }
      21. 2 let(:old_name) { author.first_name }
      22. 4 let(:author) { create(:author) }
      23. 1 before do
      24. 4 sign_in(create(:admin_user), :admin_user)
      25. end
      26. 1 it 'can create an author' do
      27. 1 visit 'admin/authors'
      28. 1 click_link('New Author')
      29. 1 fill_in 'author[first_name]', with: first_name
      30. 1 fill_in 'author[last_name]', with: last_name
      31. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      32. end
      33. 1 it 'can delete an author' do
      34. 1 author
      35. 1 visit 'admin/authors'
      36. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      37. end
      38. 1 it 'can view an author' do
      39. 1 author
      40. 1 visit 'admin/authors'
      41. 1 click_link('View')
      42. 1 expect(page).to have_content(author.first_name)
      43. end
      44. 1 it 'can edit an author' do
      45. 1 author
      46. 1 visit 'admin/authors'
      47. 1 click_link('Edit')
      48. 1 fill_in 'author[first_name]', with: new_name
      49. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      50. end
      51. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= include_context 'with api request global before and after hooks'
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      5. 1 let(:params) do
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      8. 1 =======
      9. 4 >>>>>>> d0dc1f1 (Featire specs) =======
      10. 4 >>>>>>> 752f0c0 (Featire specs) =======
      11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      16. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      17. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 5b7749a (Fix) { title: FFaker::Book.title,
      19. description: FFaker::Book.description,
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 5b7749a (Fix)
      21. dimensions: FFaker::Book.cover,
      22. year_of_publication: FFaker::Number.rand(1900..2022),
      23. materials: 'Soft cover',
      24. quantity: FFaker::Number.rand(2..5) }
      25. end
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      27. 1 before do
      28. 6 sign_in(create(:admin_user), :admin_user)
      29. 6 book
      30. 6 visit 'admin/books'
      31. end
      32. 1 it 'can create an book' do
      33. 1 click_link('New Book')
      34. 1 fill_in 'book[title]', with: params[:title]
      35. 1 fill_in 'book[description]', with: params[:description]
      36. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      37. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      38. 1 fill_in 'book[materials]', with: params[:materials]
      39. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      40. 1 fill_in 'book[quantity]', with: params[:quantity]
      41. 1 click_button('Create Book')
      42. 1 expect(page).to have_content(params[:title])
      43. end
      44. 1 it 'can delete an book' do
      45. 1 click_link('Delete')
      46. 1 expect(page).not_to have_content(book.title)
      47. end
      48. 1 it 'can view an book' do
      49. 1 click_link('View')
      50. 1 expect(page).to have_content(book.title)
      51. end
      52. 1 it 'can edit an book' do
      53. 1 click_link('Edit')
      54. 1 fill_in 'book[title]', with: 'New title'
      55. 1 click_button('Update Book')
      56. 1 expect(page).to have_content('New title')
      57. end
      58. 1 context 'when image' do
      59. 1 before do
      60. 2 click_link('Edit')
      61. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      62. 2 click_on 'Update Book'
      63. end
      64. 1 it 'can add images to book' do
      65. 1 expect(book.reload.images.count).to eq(1)
      66. end
      67. 1 it 'can delete images from book' do
      68. 1 click_link('Edit')
      69. 1 click_link('Delete')
      70. 1 expect(book.reload.images.count).to eq(0)
      71. end
      72. end
      73. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 5b7749a (Fix)
      21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 5b7749a (Fix)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      23. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      24. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 visit "books/#{book.id}"
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      29. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 5b7749a (Fix)
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      43. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) =======
      47. >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      56. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      59. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      60. =======
      61. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      62. 1 >>>>>>> 752f0c0 (Featire specs) =======
      63. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      64. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      67. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      68. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      69. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 5b7749a (Fix)
      72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      73. 1 click_link('Delete')
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. >>>>>>> d0dc1f1 (Featire specs) =======
      76. >>>>>>> 752f0c0 (Featire specs) =======
      77. >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      84. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      86. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) =======
      89. >>>>>>> 752f0c0 (Featire specs) =======
      90. >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      97. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
      99. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 5b7749a (Fix)
      100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      102. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. =======
      104. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      105. 1 >>>>>>> 752f0c0 (Featire specs) =======
      106. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      107. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      109. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      110. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      111. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      112. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 5b7749a (Fix)
      115. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 5b7749a (Fix)
      116. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 5b7749a (Fix)
      117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      118. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 5b7749a (Fix)
      119. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 5b7749a (Fix)
      120. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 5b7749a (Fix)
      122. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      124. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      125. 1 =======
      126. >>>>>>> d0dc1f1 (Featire specs) =======
      127. >>>>>>> 752f0c0 (Featire specs) =======
      128. >>>>>>> 4e81ea2 (Featire specs) =======
      129. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      131. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      133. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      134. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      135. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 5b7749a (Fix)
      136. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      137. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) =======
      40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      41. >>>>>>> 7a02bbe (Featire specs) =======
      42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      43. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      44. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when quantity changes', js: true do
      45. <<<<<<< HEAD <<<<<<< HEAD
      46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) =======
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 7a02bbe (Featire specs) =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) 1 before do
      58. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      59. 2 visit "books/#{book.id}"
      60. <<<<<<< HEAD
      61. 2 find('a', class: 'inc').click
      62. end
      63. 1 it 'increase quantity' do
      64. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      65. end
      66. 1 it 'decrease quantity' do
      67. 1 find('a', class: 'dec').click
      68. 1 expect(page).to have_content("€#{book.price}")
      69. end
      70. end
      71. end
      72. 1 describe '#catalog' do
      73. 1 describe 'filter by category' do
      74. 1 before do
      75. 2 category_one.books.create(params)
      76. 2 visit books_path
      77. end
      78. 1 after do
      79. 2 category_one.destroy
      80. end
      81. 1 it 'show book count for category' do
      82. 1 expect(page).to have_content(category_one.books.size)
      83. end
      84. 1 it 'filter book by category' do
      85. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      86. 1 click_on category_one.name
      87. end
      88. 1 expect(page).to have_content(category_one.books.first.title)
      89. end
      90. end
      91. 1 describe 'filter by all books' do
      92. 1 before do
      93. 2 category_one.books.create(params)
      94. 2 category_two.books.create(params)
      95. 2 visit books_path
      96. 2 click_on I18n.t('catalog_page.all')
      97. end
      98. 1 after do
      99. 2 category_one.destroy
      100. 2 category_two.destroy
      101. end
      102. 1 it 'shown books for first category' do
      103. 1 expect(page).to have_content(category_one.books.first.title)
      104. end
      105. 1 it 'shown books for second category' do
      106. 1 expect(page).to have_content(category_two.books.first.title)
      107. end
      108. end
      109. end
      110. 1 describe 'load_more' do
      111. 1 before do
      112. 3 24.times do
      113. 72 books << create(:book)
      114. end
      115. end
      116. 4 let(:books) { [] }
      117. 1 it 'show books without view more button' do
      118. 1 visit books_path
      119. 1 find('a', id: 'view_more', class: 'view_more').click
      120. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      121. end
      122. 1 context 'when view more' do
      123. 1 it 'show books with view more button' do
      124. 1 visit books_path
      125. 1 expect(page).to have_css('a', class: 'view_more')
      126. end
      127. 1 it 'show loaded books', js: true do
      128. 1 visit books_path
      129. 1 find('a', class: 'view_more').click
      130. 1 expect(page).to have_content(books.last.title)
      131. end
      132. end
      133. end
      134. 1 describe 'sort' do
      135. 1 shared_examples 'sort test' do
      136. 5 it 'sort books' do
      137. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      138. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      139. 5 create(:book, title: 'Anna', price_cents: 23,
      140. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      141. 5 visit books_path
      142. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      143. id: 'menu').click
      144. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      145. 5 click_link button
      146. end
      147. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      148. end
      149. end
      150. 1 context 'when sort by title A to Z' do
      151. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
      152. 2 let(:book_title) { 'Anna' }
      153. 1 include_examples 'sort test'
      154. end
      155. 1 context 'when sort by title Z to A' do
      156. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
      157. 2 let(:book_title) { 'Zimbabwe' }
      158. 1 include_examples 'sort test'
      159. end
      160. 1 context 'when sort by price High to Low' do
      161. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
      162. 2 let(:book_title) { 'Zimbabwe' }
      163. 1 include_examples 'sort test'
      164. end
      165. 1 context 'when sort by price Low to High' do
      166. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
      167. 2 let(:book_title) { 'Anna' }
      168. 1 include_examples 'sort test'
      169. end
      170. 1 context 'when sort by newest' do
      171. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
      172. 2 let(:book_title) { 'Zimbabwe' }
      173. 1 include_examples 'sort test'
      174. end
      175. end
      176. end
      <<<<<<< HEAD =======

      spec/feature/cart_spec.rb

      96.55% lines covered

      29 relevant lines. 28 lines covered and 1 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end
      >>>>>>> 366b257 (Fix)

      spec/feature/home_spec.rb

      100.0% lines covered

      49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AdminUser, type: :model do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Author, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:first_name) }
      5. 2 it { is_expected.to validate_presence_of(:last_name) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      10. end
      11. end
      12. end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe AuthorsBook, type: :model do
      2. 1 describe 'authors_book' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:author) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:author) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Book, type: :model do
      2. 1 describe 'books' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:title) }
      5. 2 it { is_expected.to validate_presence_of(:description) }
      6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
      7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
      8. 2 it { is_expected.to validate_presence_of(:quantity) }
      9. 2 it { is_expected.to validate_presence_of(:materials) }
      10. 2 it { is_expected.to validate_presence_of(:dimensions) }
      11. end
      12. 1 context 'when associations' do
      13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
      18. end
      19. end
      20. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do
      3. 1 describe 'review' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:title) }
      6. 2 it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) }
      7. end
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. 3 let(:titles) { %w[Adam Zimbabwe] }
      10. 1 let(:books_dates) do
      11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
      12. end
      13. 1 describe 'all books sort' do
      14. 1 context 'when sort by title A to Z' do
      15. 1 let(:books) do
      16. 1 create(:book, title: titles.first)
      17. 1 create(:book, title: titles.second)
      18. end
      19. 2 let(:result) { titles.second }
      20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      21. 1 include_examples 'sort test'
      22. end
      23. 1 context 'when sort title Z to A' do
      24. 1 let(:books) do
      25. 1 create(:book, title: titles.first)
      26. 1 create(:book, title: titles.second)
      27. end
      28. 2 let(:result) { titles.first }
      29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      30. 1 include_examples 'sort test'
      31. end
      32. 1 context 'when sort by price High to Low' do
      33. 1 let(:books) do
      34. 1 create(:book, price_cents: 75)
      35. 1 create(:book, price_cents: 23)
      36. end
      37. 2 let(:result) { 75 }
      38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      39. 1 include_examples 'sort test'
      40. end
      41. 1 context 'when sort price Low to High' do
      42. 1 let(:books) do
      43. 1 create(:book, price_cents: 75)
      44. 1 create(:book, price_cents: 23)
      45. end
      46. 2 let(:result) { 23 }
      47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      48. 1 include_examples 'sort test'
      49. end
      50. 1 context 'when sort by Newest' do
      51. 1 let(:books) do
      52. 1 create(:book, created_at: books_dates.first)
      53. 1 create(:book, created_at: books_dates.second)
      54. end
      55. 2 let(:result) { books_dates.first }
      56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      57. 1 include_examples 'sort test'
      58. end
      59. end
      60. end

      spec/support/configs/capybara.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. ======= >>>>>>> 824bb2b (Featire specs)
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD
      5. 7 =======
      6. =======
      7. >>>>>>> d0dc1f1 (Featire specs) =======
      8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
      9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      11. 1 let(:params) do
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      13. 1 =======
      14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      17. 4 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) { title: FFaker::Book.title,
      18. description: FFaker::Book.description,
      19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      20. dimensions: FFaker::Book.cover,
      21. year_of_publication: FFaker::Number.rand(1900..2022),
      22. materials: 'Soft cover',
      23. quantity: FFaker::Number.rand(2..5) }
      24. end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      26. 1 before do
      27. 6 sign_in(create(:admin_user), :admin_user)
      28. 6 book
      29. 6 visit 'admin/books'
      30. end
      31. 1 it 'can create an category' do
      32. 1 click_link('New Book')
      33. 1 fill_in 'book[title]', with: params[:title]
      34. 1 fill_in 'book[description]', with: params[:description]
      35. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      36. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      37. 1 fill_in 'book[materials]', with: params[:materials]
      38. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      39. 1 fill_in 'book[quantity]', with: params[:quantity]
      40. 1 click_button('Create Book')
      41. 1 expect(page).to have_content(params[:title])
      42. end
      43. 1 it 'can delete an book' do
      44. 1 click_link('Delete')
      45. 1 expect(page).not_to have_content(book.title)
      46. end
      47. 1 it 'can view an book' do
      48. 1 click_link('View')
      49. 1 expect(page).to have_content(book.title)
      50. end
      51. 1 it 'can edit an book' do
      52. 1 click_link('Edit')
      53. 1 fill_in 'book[title]', with: 'New title'
      54. 1 click_button('Update Book')
      55. 1 expect(page).to have_content('New title')
      56. end
      57. 1 context 'when image' do
      58. 1 before do
      59. 2 click_link('Edit')
      60. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      61. 2 click_on 'Update Book'
      62. end
      63. 1 it 'can add images to book' do
      64. 1 expect(book.reload.images.count).to eq(1)
      65. end
      66. 1 it 'can delete images from book' do
      67. 1 click_link('Edit')
      68. 1 click_link('Delete')
      69. 1 expect(book.reload.images.count).to eq(0)
      70. end
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      17. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      18. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      19. 1 visit "books/#{book.id}"
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      21. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      23. =======
      24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      26. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      28. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      36. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      39. =======
      40. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      41. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      42. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      43. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      44. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      46. 1 click_link('Delete')
      47. <<<<<<< HEAD <<<<<<< HEAD =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      50. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      53. =======
      54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      56. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('Catalog')
      59. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      62. =======
      63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      64. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      65. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      66. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      68. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      69. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      73. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      77. 1 =======
      78. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      80. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      81. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end
      83. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      40. >>>>>>> 4e81ea2 (Featire specs) =======
      41. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 context 'when quantity changes', js: true do
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 before do
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      55. 2 visit "books/#{book.id}"
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      61. 1 =======
      62. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      64. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      66. 2 >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD
      67. 2 >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      68. 2 >>>>>>> e3e66f3 (Featire specs) =======
      69. 1 >>>>>>> 5b7749a (Fix) it 'increase quantity' do
      70. <<<<<<< HEAD
      71. end
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= =======
      73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
      77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      79. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      80. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      83. >>>>>>> d0dc1f1 (Featire specs) =======
      84. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      85. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      86. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      87. >>>>>>> 4e81ea2 (Featire specs) =======
      88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      93. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      95. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      96. >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      98. >>>>>>> 5b7749a (Fix)
      99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      100. =======
      101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      105. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 5b7749a (Fix)
      109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      110. =======
      111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      113. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      116. >>>>>>> 4e81ea2 (Featire specs) =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      118. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
      119. end
      120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      122. 1 find('a', class: 'dec').click
      123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{book.price}")
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      125. end
      126. end
      127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      130. end
      131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      133. 1 describe '#catalog' do
      134. 1 describe 'filter by category' do
      135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      136. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe '#catalog' do
      137. 1 describe 'filter by category' do
      138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) before do
      139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      140. =======
      141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      142. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      143. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      145. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      146. >>>>>>> 4e81ea2 (Featire specs) =======
      147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      152. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      153. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      154. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      156. =======
      157. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      158. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      159. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      161. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      162. >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      168. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      169. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      170. >>>>>>> 5b7749a (Fix) 2 visit books_path
      171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      172. =======
      173. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      174. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      175. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      178. >>>>>>> 4e81ea2 (Featire specs) =======
      179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      186. >>>>>>> 5b7749a (Fix) end
      187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      188. =======
      189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      190. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      191. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      193. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. >>>>>>> 4e81ea2 (Featire specs) =======
      195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      202. >>>>>>> 5b7749a (Fix)
      203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      204. =======
      205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      210. >>>>>>> 4e81ea2 (Featire specs) =======
      211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 5b7749a (Fix) 1 after do
      219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      220. =======
      221. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      222. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      223. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      225. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      226. >>>>>>> 4e81ea2 (Featire specs) =======
      227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      232. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      233. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      234. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      236. =======
      237. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      239. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      241. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      242. >>>>>>> 4e81ea2 (Featire specs) =======
      243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      246. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      249. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      250. >>>>>>> 5b7749a (Fix) end
      251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      252. =======
      253. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      254. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      255. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      258. >>>>>>> 4e81ea2 (Featire specs) =======
      259. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      266. >>>>>>> 5b7749a (Fix)
      267. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      268. =======
      269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      270. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      271. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      272. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      273. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      274. >>>>>>> 4e81ea2 (Featire specs) =======
      275. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      282. >>>>>>> 5b7749a (Fix) 1 it 'show book count for category' do
      283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      284. =======
      285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      286. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      289. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      290. >>>>>>> 4e81ea2 (Featire specs) =======
      291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      294. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      295. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      297. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      298. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.size)
      299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      300. =======
      301. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      302. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      303. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      306. >>>>>>> 4e81ea2 (Featire specs) =======
      307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      310. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      314. >>>>>>> 5b7749a (Fix) end
      315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      316. =======
      317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      318. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      319. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      321. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      322. >>>>>>> 4e81ea2 (Featire specs) =======
      323. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      324. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      328. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      329. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      330. >>>>>>> 5b7749a (Fix)
      331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      332. 1 it 'filter book by category' do
      333. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      335. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'filter book by category' do
      336. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      337. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) click_on category_one.name
      338. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      339. =======
      340. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      341. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      342. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      343. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      344. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      345. >>>>>>> 4e81ea2 (Featire specs) =======
      346. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      348. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      349. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      350. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      351. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      352. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      353. >>>>>>> 5b7749a (Fix) end
      354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      355. =======
      356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      357. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      358. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      361. >>>>>>> 4e81ea2 (Featire specs) =======
      362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      367. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      368. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      369. >>>>>>> 5b7749a (Fix)
      370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      371. =======
      372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      373. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      374. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      376. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      377. >>>>>>> 4e81ea2 (Featire specs) =======
      378. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      380. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      381. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      382. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      383. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      384. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      385. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      387. =======
      388. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      389. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      390. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      393. >>>>>>> 4e81ea2 (Featire specs) =======
      394. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      396. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      397. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      398. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      399. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      400. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      401. >>>>>>> 5b7749a (Fix) end
      402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      403. =======
      404. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      405. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      406. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      408. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      409. >>>>>>> 4e81ea2 (Featire specs) =======
      410. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      413. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      415. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      416. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      417. >>>>>>> 5b7749a (Fix) end
      418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      419. =======
      420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      421. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      422. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      424. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      425. >>>>>>> 4e81ea2 (Featire specs) =======
      426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 5b7749a (Fix)
      434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      435. =======
      436. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      437. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      440. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      441. >>>>>>> 4e81ea2 (Featire specs) =======
      442. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      443. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      444. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      445. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      446. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      447. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      448. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      449. >>>>>>> 5b7749a (Fix) 1 describe 'filter by all books' do
      450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      451. =======
      452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      454. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      455. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      456. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      457. >>>>>>> 4e81ea2 (Featire specs) =======
      458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      461. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      465. >>>>>>> 5b7749a (Fix) 1 before do
      466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      467. =======
      468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      469. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      470. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      473. >>>>>>> 4e81ea2 (Featire specs) =======
      474. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      475. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      479. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      480. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      481. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      483. 2 category_two.books.create(params)
      484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 5b7749a (Fix)
      487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      488. 2 click_on 'All'
      489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      491. =======
      492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      493. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      494. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      497. >>>>>>> 4e81ea2 (Featire specs) =======
      498. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      501. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      505. >>>>>>> 5b7749a (Fix)
      506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      507. =======
      508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      509. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      510. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      511. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      512. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      513. >>>>>>> 4e81ea2 (Featire specs) =======
      514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      519. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      520. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      521. >>>>>>> 5b7749a (Fix) 1 after do
      522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      523. =======
      524. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      525. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      526. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      527. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      528. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      529. >>>>>>> 4e81ea2 (Featire specs) =======
      530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      532. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      533. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      534. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      535. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      536. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      537. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      539. =======
      540. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      541. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      542. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      545. >>>>>>> 4e81ea2 (Featire specs) =======
      546. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      547. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      553. >>>>>>> 5b7749a (Fix) 2 category_two.destroy
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      555. =======
      556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      561. >>>>>>> 4e81ea2 (Featire specs) =======
      562. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      563. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      567. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      568. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      569. >>>>>>> 5b7749a (Fix) end
      570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      571. =======
      572. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      573. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      574. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      576. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      577. >>>>>>> 4e81ea2 (Featire specs) =======
      578. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      579. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      583. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      584. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      585. >>>>>>> 5b7749a (Fix)
      586. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      587. =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      589. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      590. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      593. >>>>>>> 4e81ea2 (Featire specs) =======
      594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      599. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      600. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      601. >>>>>>> 5b7749a (Fix) 1 it 'shown books for first category' do
      602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      603. =======
      604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      605. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      606. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      609. >>>>>>> 4e81ea2 (Featire specs) =======
      610. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      611. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      612. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      613. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      614. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      615. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      616. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      617. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      619. =======
      620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      624. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      625. >>>>>>> 4e81ea2 (Featire specs) =======
      626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      629. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      630. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      631. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      632. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      633. >>>>>>> 5b7749a (Fix) end
      634. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      635. =======
      636. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      637. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      638. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      641. >>>>>>> 4e81ea2 (Featire specs) =======
      642. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      644. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      645. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      646. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      647. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      648. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      649. >>>>>>> 5b7749a (Fix)
      650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      651. =======
      652. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      653. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      654. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      657. >>>>>>> 4e81ea2 (Featire specs) =======
      658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      663. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      664. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      665. >>>>>>> 5b7749a (Fix) 1 it 'shown books for second category' do
      666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      667. =======
      668. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      669. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      670. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      672. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      673. >>>>>>> 4e81ea2 (Featire specs) =======
      674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      680. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      681. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_two.books.first.title)
      682. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      683. end
      684. end
      685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      686. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      688. end
      689. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      691. =======
      692. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      693. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      694. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      697. >>>>>>> 4e81ea2 (Featire specs) =======
      698. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      699. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      705. >>>>>>> 5b7749a (Fix) 1 describe 'load_more' do
      706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      707. =======
      708. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      709. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      710. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      712. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      713. >>>>>>> 4e81ea2 (Featire specs) =======
      714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      721. >>>>>>> 5b7749a (Fix) 1 before do
      722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      723. =======
      724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      725. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      726. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      727. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      728. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      729. >>>>>>> 4e81ea2 (Featire specs) =======
      730. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      731. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 5b7749a (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 5b7749a (Fix)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      739. =======
      740. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      741. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      742. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      745. >>>>>>> 4e81ea2 (Featire specs) =======
      746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      748. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      749. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      751. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      752. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      753. >>>>>>> 5b7749a (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) books << create(:book)
      754. end
      755. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      758. 4 =======
      759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      761. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      762. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      763. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      765. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      767. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      768. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      769. 4 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 5b7749a (Fix)
      770. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      771. 1 =======
      772. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      773. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      774. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      775. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      776. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      777. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      778. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      779. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      780. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      781. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      782. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 5b7749a (Fix)
      783. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      784. 1 visit books_path
      785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      786. >>>>>>> d0dc1f1 (Featire specs) =======
      787. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      789. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      790. >>>>>>> 4e81ea2 (Featire specs) =======
      791. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      794. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      799. 1 it 'show books without view more button' do
      800. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      801. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      802. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 5b7749a (Fix)
      803. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      804. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      805. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      807. =======
      808. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      809. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      810. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      811. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      812. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      813. >>>>>>> 4e81ea2 (Featire specs) =======
      814. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      817. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      818. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      819. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      820. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      821. >>>>>>> 5b7749a (Fix)
      822. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      823. 1 context 'when view more' do
      824. 1 it 'show books with view more button' do
      825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      826. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      827. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      828. =======
      829. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      830. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      831. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      832. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      833. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      835. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      836. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      837. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      838. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      839. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      840. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 5b7749a (Fix)
      841. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      842. 1 expect(page).to have_css('a', class: 'view_more')
      843. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      844. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      845. =======
      846. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      847. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      848. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      850. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      851. >>>>>>> 4e81ea2 (Featire specs) =======
      852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      854. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      855. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      856. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      857. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      858. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      859. >>>>>>> 5b7749a (Fix)
      860. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      861. =======
      862. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      863. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      864. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      866. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      867. >>>>>>> 4e81ea2 (Featire specs) =======
      868. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      870. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      871. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      872. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      873. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      874. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      875. >>>>>>> 5b7749a (Fix) 1 it 'show loaded books', js: true do
      876. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      877. 1 visit books_path
      878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      879. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      880. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 5b7749a (Fix)
      881. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      882. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      883. =======
      884. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      885. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      886. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      887. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      890. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      891. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      892. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      893. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      894. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      896. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      897. end
      898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      899. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      900. =======
      901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      902. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      903. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      904. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      905. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      906. >>>>>>> 4e81ea2 (Featire specs) =======
      907. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      908. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      909. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      910. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      912. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      913. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      914. >>>>>>> 5b7749a (Fix) 1 describe 'sort' do
      915. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      916. =======
      917. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      918. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      919. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      921. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      922. >>>>>>> 4e81ea2 (Featire specs) =======
      923. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      924. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      926. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      927. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      928. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      929. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      930. >>>>>>> 5b7749a (Fix) 1 shared_examples 'sort test' do
      931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      932. =======
      933. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      934. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      935. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      937. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      938. >>>>>>> 4e81ea2 (Featire specs) =======
      939. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      941. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      942. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      943. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      944. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      945. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      946. >>>>>>> 5b7749a (Fix) 5 it 'sort books' do
      947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      948. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      949. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      950. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      951. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 5b7749a (Fix)
      952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5b7749a (Fix)
      953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      954. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      955. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      956. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      957. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      958. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      959. >>>>>>> 5b7749a (Fix)
      960. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      961. =======
      962. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      963. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      964. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      965. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      967. >>>>>>> 4e81ea2 (Featire specs) =======
      968. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      969. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      970. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      971. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      972. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      973. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      974. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      975. >>>>>>> 5b7749a (Fix) 5 visit books_path
      976. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      977. =======
      978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      979. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      980. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      981. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      982. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      983. >>>>>>> 4e81ea2 (Featire specs) =======
      984. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      985. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      989. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      990. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      991. >>>>>>> 5b7749a (Fix)
      992. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      993. =======
      994. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      995. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      996. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      998. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      999. >>>>>>> 4e81ea2 (Featire specs) =======
      1000. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      1002. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1004. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1005. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1006. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1007. >>>>>>> 5b7749a (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1008. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      1009. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1010. 5 click_link button
      1011. end
      1012. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1013. end
      1014. end
      1015. 1 context 'when sort by title A to Z' do
      1016. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 5b7749a (Fix)
      1017. 2 let(:book_title) { 'Anna' }
      1018. 1 include_examples 'sort test'
      1019. end
      1020. 1 context 'when sort by title Z to A' do
      1021. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 5b7749a (Fix)
      1022. 2 let(:book_title) { 'Zimbabwe' }
      1023. 1 include_examples 'sort test'
      1024. end
      1025. 1 context 'when sort by price High to Low' do
      1026. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 5b7749a (Fix)
      1027. 2 let(:book_title) { 'Zimbabwe' }
      1028. 1 include_examples 'sort test'
      1029. end
      1030. 1 context 'when sort by price Low to High' do
      1031. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 5b7749a (Fix)
      1032. 2 let(:book_title) { 'Anna' }
      1033. 1 include_examples 'sort test'
      1034. end
      1035. 1 context 'when sort by newest' do
      1036. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 5b7749a (Fix)
      1037. 2 let(:book_title) { 'Zimbabwe' }
      1038. 1 include_examples 'sort test'
      1039. end
      1040. end
      1041. end

      spec/feature/cart_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe AdminUser, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 5b7749a (Fix)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 2 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:email) } >>>>>>> 5b7749a (Fix)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 2 =======
      18. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 1 >>>>>>> 752f0c0 (Featire specs) =======
      20. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit root_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:password) } >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 1 click_on 'Get Started'
      30. 1 expect(page).to have_content('Catalog')
      31. end
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      34. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. 1 describe 'navbar' do
      36. 2 let(:books_category) { FactoryBot.create(:books_category) }
      37. 1 it 'on click home move to root-path' do
      38. 1 visit books_path
      39. 1 find('a', id: 'root').click
      40. 1 expect(page).to have_content('Get Started')
      41. end
      42. 1 it 'on click category name move to root-path with books that belong to this category' do
      43. 1 books_category
      44. 1 visit root_path
      45. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      46. 1 within('ul', id: 'nav') do
      47. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      48. end
      49. 1 expect(page).to have_content(books_category.category.books.first.title)
      50. end
      51. end
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD =======
      9. >>>>>>> d0dc1f1 (Featire specs) =======
      10. >>>>>>> 752f0c0 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 08edf50 (Featire specs) =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      21. =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      27. >>>>>>> 08edf50 (Featire specs) =======
      28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      31. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      32. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      33. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 5b7749a (Fix)
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. 1 describe 'author' do
      37. 1 context 'when validations' do
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:authors_books).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. =======
      42. >>>>>>> d0dc1f1 (Featire specs) =======
      43. >>>>>>> 752f0c0 (Featire specs) =======
      44. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      47. >>>>>>> 08edf50 (Featire specs) =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:books).through(:authors_books) } >>>>>>> 5b7749a (Fix)
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      55. =======
      56. >>>>>>> d0dc1f1 (Featire specs) =======
      57. >>>>>>> 752f0c0 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      65. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      66. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      67. >>>>>>> 5b7749a (Fix) end
      68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      69. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      70. 1 context 'when associations' do
      71. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      72. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      73. end
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      75. >>>>>>> 5b7749a (Fix) end
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. =======
      78. >>>>>>> d0dc1f1 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) =======
      80. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 08edf50 (Featire specs) =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      88. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 5b7749a (Fix) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. =======
      5. >>>>>>> d0dc1f1 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      10. >>>>>>> 08edf50 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      15. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 5b7749a (Fix) 1 describe 'authors_book' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      18. =======
      19. >>>>>>> d0dc1f1 (Featire specs) =======
      20. >>>>>>> 752f0c0 (Featire specs) =======
      21. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      23. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      24. >>>>>>> 08edf50 (Featire specs) =======
      25. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      26. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      27. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      28. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      29. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      30. >>>>>>> 5b7749a (Fix) 1 context 'when validations' do
      31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      32. 2 it { is_expected.to validate_presence_of(:book) }
      33. 2 it { is_expected.to validate_presence_of(:author) }
      34. end
      35. 1 context 'when associations' do
      36. 2 it { is_expected.to belong_to(:author) }
      37. 2 it { is_expected.to belong_to(:book) }
      38. end
      39. end
      40. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 5b7749a (Fix)
      8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 5b7749a (Fix)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD =======
      14. >>>>>>> d0dc1f1 (Featire specs) =======
      15. >>>>>>> 752f0c0 (Featire specs) =======
      16. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      19. >>>>>>> 08edf50 (Featire specs) =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      23. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. =======
      27. >>>>>>> d0dc1f1 (Featire specs) =======
      28. >>>>>>> 752f0c0 (Featire specs) =======
      29. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      32. >>>>>>> 08edf50 (Featire specs) =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      37. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      40. 1 context 'when not validations' do
      41. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      42. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      43. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      44. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      46. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      47. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      48. end
      49. <<<<<<< HEAD =======
      50. >>>>>>> d0dc1f1 (Featire specs) =======
      51. >>>>>>> 752f0c0 (Featire specs) =======
      52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 08edf50 (Featire specs) =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      59. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      60. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      62. =======
      63. >>>>>>> d0dc1f1 (Featire specs) =======
      64. >>>>>>> 752f0c0 (Featire specs) =======
      65. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      68. >>>>>>> 08edf50 (Featire specs) =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      72. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      73. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      74. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 5b7749a (Fix)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      76. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. 2 it { is_expected.to belong_to(:book) }
      78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 5b7749a (Fix) end
      80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      81. =======
      82. >>>>>>> d0dc1f1 (Featire specs) =======
      83. >>>>>>> 752f0c0 (Featire specs) =======
      84. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      86. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 08edf50 (Featire specs) =======
      88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      90. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      91. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      92. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 5b7749a (Fix) end
      94. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      95. =======
      96. >>>>>>> d0dc1f1 (Featire specs) =======
      97. >>>>>>> 752f0c0 (Featire specs) =======
      98. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      99. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      100. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      101. >>>>>>> 08edf50 (Featire specs) =======
      102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      103. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      104. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      105. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      106. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      107. >>>>>>> 5b7749a (Fix) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Book, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      11. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      12. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'books' do >>>>>>> 5b7749a (Fix)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do
      15. 1 describe 'books' do
      16. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) context 'when validations' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      18. 2 it { is_expected.to validate_presence_of(:title) }
      19. 2 it { is_expected.to validate_presence_of(:description) }
      20. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 5b7749a (Fix)
      22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 5b7749a (Fix)
      23. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:quantity) } >>>>>>> 5b7749a (Fix)
      24. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:materials) } >>>>>>> 5b7749a (Fix)
      25. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
      26. 2 it { is_expected.to validate_presence_of(:materials) }
      27. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:dimensions) }
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. =======
      30. >>>>>>> d0dc1f1 (Featire specs) =======
      31. >>>>>>> 752f0c0 (Featire specs) =======
      32. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      33. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      34. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) end
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      43. =======
      44. >>>>>>> d0dc1f1 (Featire specs) =======
      45. >>>>>>> 752f0c0 (Featire specs) =======
      46. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      47. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      49. >>>>>>> 08edf50 (Featire specs) =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix)
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      57. =======
      58. >>>>>>> d0dc1f1 (Featire specs) =======
      59. >>>>>>> 752f0c0 (Featire specs) =======
      60. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      61. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      63. >>>>>>> 08edf50 (Featire specs) =======
      64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      65. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      67. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      68. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      69. >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      71. =======
      72. >>>>>>> d0dc1f1 (Featire specs) =======
      73. >>>>>>> 752f0c0 (Featire specs) =======
      74. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      75. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      77. >>>>>>> 08edf50 (Featire specs) =======
      78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      80. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      81. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      82. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      83. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      85. =======
      86. >>>>>>> d0dc1f1 (Featire specs) =======
      87. >>>>>>> 752f0c0 (Featire specs) =======
      88. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      89. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      91. >>>>>>> 08edf50 (Featire specs) =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      95. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      96. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      97. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      99. =======
      100. >>>>>>> d0dc1f1 (Featire specs) =======
      101. >>>>>>> 752f0c0 (Featire specs) =======
      102. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      103. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      105. >>>>>>> 08edf50 (Featire specs) =======
      106. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      107. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      108. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      109. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      110. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      111. >>>>>>> 5b7749a (Fix)
      112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      113. =======
      114. >>>>>>> d0dc1f1 (Featire specs) =======
      115. >>>>>>> 752f0c0 (Featire specs) =======
      116. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      118. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      119. >>>>>>> 08edf50 (Featire specs) =======
      120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      121. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      123. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      124. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      125. >>>>>>> 5b7749a (Fix) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      127. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      128. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      129. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      130. end
      131. end
      132. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/order_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 6 relevant lines. 6 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Order, type: :model do
      3. 1 describe 'order' do
      4. 1 context 'when associations' do
      5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
      6. 2 it { is_expected.to have_many(:books).through(:order_books) }
      7. end
      8. end
      9. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 5b7749a (Fix)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 5b7749a (Fix)
      6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. end
      7. <<<<<<< HEAD
      8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      11. end
      12. end
      13. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'category' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 5 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      16. 5 =======
      17. 2 >>>>>>> d0dc1f1 (Featire specs) =======
      18. 2 >>>>>>> 752f0c0 (Featire specs) =======
      19. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      20. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      22. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      23. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      24. 2 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      25. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      27. 5 expect(test).to eq(result)
      28. =======
      29. >>>>>>> d0dc1f1 (Featire specs) =======
      30. >>>>>>> 752f0c0 (Featire specs) =======
      31. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      32. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      34. >>>>>>> 08edf50 (Featire specs) =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      36. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      37. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      38. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      39. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      42. 1 context 'when associations' do
      43. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      44. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      45. end
      46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      48. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. ======= >>>>>>> 5b7749a (Fix)
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      11. 3 =======
      12. >>>>>>> d0dc1f1 (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      16. >>>>>>> 7a02bbe (Featire specs) =======
      17. >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= begin >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 5b7749a (Fix)
      19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books_dates) do >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      21. 1 =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> 7a02bbe (Featire specs) =======
      27. >>>>>>> 4552227 (Featire specs) =======
      28. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 5b7749a (Fix)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> 7a02bbe (Featire specs) =======
      37. >>>>>>> 4552227 (Featire specs) =======
      38. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      41. exit 1
      42. end
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      44. >>>>>>> 5b7749a (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      46. 1 describe 'all books sort' do
      47. 1 context 'when sort by title A to Z' do
      48. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      49. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books) do >>>>>>> 5b7749a (Fix)
      50. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 5b7749a (Fix)
      51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 5b7749a (Fix)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      53. end
      54. 2 let(:result) { titles.second }
      55. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      56. <<<<<<< HEAD =======
      57. >>>>>>> d0dc1f1 (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) =======
      59. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= include_examples 'sort test' >>>>>>> 5b7749a (Fix)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      65. end
      66. <<<<<<< HEAD =======
      67. >>>>>>> d0dc1f1 (Featire specs) =======
      68. >>>>>>> 752f0c0 (Featire specs) =======
      69. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      70. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      71. >>>>>>> 08edf50 (Featire specs) =======
      72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      73. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 5b7749a (Fix)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      75. 1 let(:books) do
      76. 1 create(:book, title: titles.first)
      77. 1 create(:book, title: titles.second)
      78. end
      79. 2 let(:result) { titles.first }
      80. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      81. 1 include_examples 'sort test'
      82. end
      83. 1 context 'when sort by price High to Low' do
      84. 1 let(:books) do
      85. 1 create(:book, price_cents: 75)
      86. 1 create(:book, price_cents: 23)
      87. end
      88. 2 let(:result) { 75 }
      89. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      90. 1 include_examples 'sort test'
      91. end
      92. 1 context 'when sort price Low to High' do
      93. 1 let(:books) do
      94. 1 create(:book, price_cents: 75)
      95. 1 create(:book, price_cents: 23)
      96. end
      97. 2 let(:result) { 23 }
      98. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      99. 1 include_examples 'sort test'
      100. end
      101. 1 context 'when sort by Newest' do
      102. 1 let(:books) do
      103. 1 create(:book, created_at: books_dates.first)
      104. 1 create(:book, created_at: books_dates.second)
      105. end
      106. 2 let(:result) { books_dates.first }
      107. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      108. 1 include_examples 'sort test'
      109. end
      110. end
      111. <<<<<<< HEAD =======
      112. >>>>>>> d0dc1f1 (Featire specs) =======
      113. >>>>>>> 752f0c0 (Featire specs) =======
      114. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      115. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      116. >>>>>>> 08edf50 (Featire specs) =======
      117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      118. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 36.84% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 5b7749a (Fix) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
      1. 1 =======
      2. >>>>>>> d0dc1f1 (Featire specs) =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      6. >>>>>>> 7a02bbe (Featire specs) =======
      7. >>>>>>> 4552227 (Featire specs) =======
      8. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      11. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      13. =======
      14. >>>>>>> bd8bda4 (Manifest_cache true) =======
      15. >>>>>>> 36356d3 (Featire specs) =======
      16. >>>>>>> 64dceec (Manifest_cache true) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
      17. <<<<<<< HEAD <<<<<<< HEAD
      18. =======
      19. >>>>>>> bd8bda4 (Manifest_cache true) =======
      20. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
      21. ======= >>>>>>> 6da9530 (Featire specs)
      22. 2 let(:first_name) { FFaker::Name.first_name }
      23. 2 let(:last_name) { FFaker::Name.last_name }
      24. 2 let(:new_name) { FFaker::Name.first_name }
      25. 2 let(:old_name) { author.first_name }
      26. 4 let(:author) { create(:author) }
      27. 1 before do
      28. 4 sign_in(create(:admin_user), :admin_user)
      29. end
      30. 1 it 'can create an author' do
      31. 1 visit 'admin/authors'
      32. 1 click_link('New Author')
      33. 1 fill_in 'author[first_name]', with: first_name
      34. 1 fill_in 'author[last_name]', with: last_name
      35. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      36. end
      37. 1 it 'can delete an author' do
      38. 1 author
      39. 1 visit 'admin/authors'
      40. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      41. end
      42. 1 it 'can view an author' do
      43. 1 author
      44. 1 visit 'admin/authors'
      45. 1 click_link('View')
      46. 1 expect(page).to have_content(author.first_name)
      47. end
      48. 1 it 'can edit an author' do
      49. 1 author
      50. 1 visit 'admin/authors'
      51. 1 click_link('Edit')
      52. 1 fill_in 'author[first_name]', with: new_name
      53. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      54. end
      55. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      32 relevant lines. 32 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. >>>>>>> c7a726c5 (Rebased) 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      5. 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
      6. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      7. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) =======
      9. <<<<<<< HEAD 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 5 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 5 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 5 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 5 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= book
      16. ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      17. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= =======
      19. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= =======
      20. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      21. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 5 <<<<<<< HEAD <<<<<<< HEAD quantity { 1 } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { create(:book) } ======= >>>>>>> 6da9530 (Featire specs) let(:category_one) { FactoryBot.create(:category) } >>>>>>> 610b6138 (Featire specs)
      24. end
      25. end

      spec/factories/orders.rb

      77.78% lines covered

      9 relevant lines. 7 lines covered and 2 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :order do
      3. 5 status { 'created' }
      4. 1 transient do
      5. 1 books_count { 1 }
      6. end
      7. 1 after :create do |order, books_count|
      8. 4 order.books do
      9. Array.new(books_count) do
      10. association(:order, books: [instance])
      11. end
      12. end
      13. end
      14. end
      15. end

      spec/factories/reviews.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :review do
      3. 1 title { FFaker::Lorem.words(5) }
      4. 1 rating { FFaker::Number.rand(0..5) } >>>>>>> 5b7749a (Fix)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      6. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 =======
      8. 3 <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) =======
      9. 3 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 3 ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      11. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      12. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= =======
      13. 3 >>>>>>> 7a02bbe (Featire specs) =======
      14. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      15. 3 >>>>>>> 4552227 (Featire specs) =======
      16. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) body { FFaker::Lorem.words(500) }
      18. end
      19. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      spec/factories/users.rb

      100.0% lines covered

      2 relevant lines. 2 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. <<<<<<< HEAD <<<<<<< HEAD
      4. =======
      5. 1 =======
      6. 13 >>>>>>> 67ab5299 (Fix) email { FFaker::Internet.email }
      7. 20 password { 'password' }
      8. 20 confirmed_at { Time.zone.now }
      9. >>>>>>> 75fa7e1b (Rebased) end
      10. end
      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs)

      spec/factories/reviews.rb

      ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      >>>>>>> c033601 (Rebased)

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= =======

      =======

      spec/feature/admin/author_spec.rb

      >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 9a49b7b (Rebased) ======= 31 relevant lines. 31 lines covered and >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD FactoryBot.define do ======= <<<<<<< HEAD <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 9a49b7b (Rebased) ======= RSpec.describe 'Author' do >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      2. 1 <<<<<<< HEAD factory :review do ======= <<<<<<< HEAD <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> 9a49b7b (Rebased) ======= include_context 'with api request authentication helper methods' >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      3. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) title { FFaker::Lorem.words(5) } <<<<<<< HEAD ======= ======= include_context 'with api request global before and after hooks' >>>>>>> 9a49b7b (Rebased) ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Books', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= title { FFaker::Lorem.words(5) } >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= RSpec.describe 'Books', type: :feature do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
      4. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs)
      5. 1 =======
      6. 5 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 5 >>>>>>> 752f0c0 (Featire specs) =======
      8. 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) } ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_one) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      10. 1 =======
      11. 3 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 3 >>>>>>> 752f0c0 (Featire specs) =======
      13. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) body { FFaker::Lorem.words(500) }
      14. end
      15. end

      spec/factories/shippings.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :shipping do
      3. 1 user
      4. 1 address { FFaker::AddressUA.street_address }
      5. 1 city { FFaker::AddressUA.city }
      6. 1 zip { FFaker::AddressUA.zip_code }
      7. 1 country { FFaker::AddressUA.country }
      8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
      9. end
      10. end
      >>>>>>> aca90e3 (Rebased)

      spec/factories/users.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 FactoryBot.define do
      2. 1 factory :user do
      3. 17 email { FFaker::Internet.email }
      4. 24 password { 'password' }
      5. 24 confirmed_at { Time.zone.now }
      6. end
      7. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
      =======
      >>>>>>> aca90e3 (Rebased)

      spec/feature/admin/author_spec.rb

      ======= >>>>>>> 0d6dd12 (Manifest_cache true)

      =======

      spec/feature/admin/author_spec.rb

      <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true)

      100.0% lines covered

      31 relevant lines. 31 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9a49b7b (Rebased) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true)
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= include_context 'with api request global before and after hooks'
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 7 let(:book) { create(:book) } <<<<<<< HEAD ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 08edf50 (Featire specs) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= let(:book) { create(:book) } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      5. 1 let(:params) do
      6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      7. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      8. 1 =======
      9. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      16. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      17. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      18. 1 >>>>>>> 5b7749a (Fix) =======
      19. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      20. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      22. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) { title: FFaker::Book.title,
      23. description: FFaker::Book.description,
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 5b7749a (Fix) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      25. dimensions: FFaker::Book.cover,
      26. year_of_publication: FFaker::Number.rand(1900..2022),
      27. materials: 'Soft cover',
      28. quantity: FFaker::Number.rand(2..5) }
      29. end
      30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      31. 1 before do
      32. <<<<<<< HEAD
      33. 6 =======
      34. 4 >>>>>>> c7a726c5 (Rebased) sign_in(create(:admin_user), :admin_user)
      35. <<<<<<< HEAD
      36. 6 =======
      37. 4 >>>>>>> c7a726c5 (Rebased) book
      38. <<<<<<< HEAD
      39. 6 =======
      40. 4 >>>>>>> c7a726c5 (Rebased) visit 'admin/books'
      41. end
      42. 1 <<<<<<< HEAD it 'can create an book' do ======= it 'can create an category' do >>>>>>> c7a726c5 (Rebased)
      43. 1 click_link('New Book')
      44. 1 fill_in 'book[title]', with: params[:title]
      45. 1 fill_in 'book[description]', with: params[:description]
      46. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication] <<<<<<< HEAD
      47. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      48. 1 fill_in 'book[materials]', with: params[:materials]
      49. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      50. 1 fill_in 'book[quantity]', with: params[:quantity]
      51. 1 click_button('Create Book')
      52. 1 expect(page).to have_content(params[:title])
      53. end
      54. 1 it 'can delete an book' do
      55. 1 click_link('Delete')
      56. 1 expect(page).not_to have_content(book.title)
      57. end
      58. 1 it 'can view an book' do
      59. 1 click_link('View')
      60. 1 expect(page).to have_content(book.title)
      61. end
      62. 1 it 'can edit an book' do
      63. 1 click_link('Edit')
      64. 1 fill_in 'book[title]', with: 'New title'
      65. 1 click_button('Update Book')
      66. 1 expect(page).to have_content('New title')
      67. end
      68. 1 context 'when image' do
      69. 1 before do
      70. 2 click_link('Edit')
      71. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      72. 2 click_on 'Update Book'
      73. end
      74. 1 it 'can add images to book' do
      75. 1 expect(book.reload.images.count).to eq(1)
      76. end
      77. 1 it 'can delete images from book' do
      78. 1 click_link('Edit')
      79. 1 click_link('Delete')
      80. 1 expect(book.reload.images.count).to eq(0)
      81. end
      82. end
      83. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe '#show book' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can create an category' do >>>>>>> 5b7749a (Fix)
      21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books info' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('New Category') >>>>>>> 5b7749a (Fix)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      23. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      24. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      25. 1 visit "books/#{book.id}"
      26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      29. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      40. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      41. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(book.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: category_name >>>>>>> 5b7749a (Fix)
      42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      43. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) =======
      47. >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      51. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      56. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked Beck to results' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category_name) >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      59. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      60. =======
      61. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      62. 1 >>>>>>> 752f0c0 (Featire specs) =======
      63. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      64. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      67. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      68. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      69. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can delete an category' do >>>>>>> 5b7749a (Fix)
      72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      73. 1 click_link('Delete')
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. >>>>>>> d0dc1f1 (Featire specs) =======
      76. >>>>>>> 752f0c0 (Featire specs) =======
      77. >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      84. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      86. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) =======
      89. >>>>>>> 752f0c0 (Featire specs) =======
      90. >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      94. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      95. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      97. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog') ======= >>>>>>> c7a726c5 (Rebased)
      99. 1 <<<<<<< HEAD end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= fill_in 'book[price_cents]', with: params[:price_cents] >>>>>>> c7a726c5 (Rebased)
      100. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= fill_in 'book[materials]', with: params[:materials] >>>>>>> c7a726c5 (Rebased)
      101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      102. ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. =======
      104. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      105. 1 >>>>>>> 752f0c0 (Featire specs) =======
      106. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      107. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      109. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      110. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      111. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      112. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when test read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= fill_in 'book[dimensions]', with: params[:dimensions] >>>>>>> c7a726c5 (Rebased)
      114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can view an category' do >>>>>>> 5b7749a (Fix) ======= fill_in 'book[quantity]', with: params[:quantity]
      115. 1 click_button('Create Book')
      116. 1 expect(page).to have_content(params[:title])
      117. end
      118. 1 it 'can delete an book' do
      119. 1 click_link('Delete')
      120. 1 expect(page).not_to have_content(book.title)
      121. end
      122. 1 it 'can view an book' do
      123. 1 click_link('View')
      124. 1 expect(page).to have_content(book.title)
      125. end
      126. 1 it 'can edit an book' do
      127. 1 click_link('Edit')
      128. 1 fill_in 'book[title]', with: 'New title'
      129. 1 click_button('Update Book')
      130. 1 expect(page).to have_content('New title')
      131. end
      132. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. end
      11. 1 it 'can create an category' do
      12. 1 click_link('New Category')
      13. 1 fill_in 'category[name]', with: category_name
      14. 1 click_button('Create Category')
      15. 1 expect(page).to have_content(category_name)
      16. end
      17. 1 it 'can delete an category' do
      18. 1 click_link('Delete')
      19. 1 expect(page).not_to have_content(category.name)
      20. end
      21. 1 it 'can view an category' do >>>>>>> c7a726c5 (Rebased)
      22. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('View') >>>>>>> 5b7749a (Fix) ======= click_link('View') >>>>>>> c7a726c5 (Rebased)
      23. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(category.name) >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content(category.name) >>>>>>> c7a726c5 (Rebased)
      24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix) ======= end >>>>>>> c7a726c5 (Rebased)
      25. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'can edit an category' do >>>>>>> 5b7749a (Fix) ======= it 'can edit an category' do >>>>>>> c7a726c5 (Rebased)
      26. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_link('Edit') >>>>>>> 5b7749a (Fix) ======= click_link('Edit') >>>>>>> c7a726c5 (Rebased)
      27. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 5b7749a (Fix) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> c7a726c5 (Rebased)
      28. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_button('Update Category') >>>>>>> 5b7749a (Fix) ======= click_button('Update Category') >>>>>>> c7a726c5 (Rebased)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      31. 1 ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      32. 1 =======
      33. >>>>>>> d0dc1f1 (Featire specs) =======
      34. >>>>>>> 752f0c0 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) =======
      36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. 1 >>>>>>> 5b7749a (Fix) =======
      43. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('New Genre') >>>>>>> 5b7749a (Fix) ======= expect(page).to have_content('New Genre') >>>>>>> c7a726c5 (Rebased)
      44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end
      45. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 <<<<<<< HEAD click_link I18n.t('book_page.read_more') ======= click_link 'Read More' >>>>>>> c7a726c5 (Rebased)
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) =======
      40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      41. >>>>>>> 7a02bbe (Featire specs) =======
      42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      43. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      44. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 1 context 'when quantity changes', js: true do
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      46. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) =======
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      53. >>>>>>> 7a02bbe (Featire specs) =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) =======
      58. >>>>>>> c7a726c5 (Rebased) 1 before do
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      60. 2 visit "books/#{book.id}"
      61. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased)
      62. 2 find('a', class: 'inc').click
      63. end
      64. 1 <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      65. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      66. end
      67. 1 <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      68. 1 find('a', class: 'dec').click
      69. 1 expect(page).to have_content("€#{book.price}")
      70. end
      71. end
      72. end
      73. 1 describe '#catalog' do
      74. 1 describe 'filter by category' do
      75. 1 before do
      76. 2 category_one.books.create(params)
      77. 2 visit books_path
      78. end
      79. 1 after do
      80. 2 category_one.destroy
      81. end
      82. 1 it 'show book count for category' do
      83. 1 expect(page).to have_content(category_one.books.size)
      84. end
      85. 1 it 'filter book by category' do
      86. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      87. 1 click_on category_one.name
      88. end
      89. 1 expect(page).to have_content(category_one.books.first.title)
      90. end
      91. end
      92. 1 describe 'filter by all books' do
      93. 1 before do
      94. 2 category_one.books.create(params)
      95. 2 category_two.books.create(params)
      96. 2 visit books_path
      97. 2 click_on I18n.t('catalog_page.all')
      98. end
      99. 1 after do
      100. 2 category_one.destroy
      101. 2 category_two.destroy
      102. end
      103. 1 it 'shown books for first category' do
      104. 1 expect(page).to have_content(category_one.books.first.title)
      105. end
      106. 1 it 'shown books for second category' do
      107. 1 expect(page).to have_content(category_two.books.first.title)
      108. end
      109. end
      110. end
      111. 1 describe 'load_more' do
      112. 1 before do
      113. 3 <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
      114. 72 books << create(:book)
      115. end
      116. end
      117. 4 let(:books) { [] }
      118. 1 it 'show books without view more button' do
      119. 1 visit books_path
      120. 1 find('a', id: 'view_more', class: 'view_more').click
      121. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      122. end
      123. 1 context 'when view more' do
      124. 1 it 'show books with view more button' do
      125. 1 visit books_path
      126. 1 expect(page).to have_css('a', class: 'view_more')
      127. end
      128. 1 it 'show loaded books', js: true do
      129. 1 visit books_path
      130. 1 find('a', class: 'view_more').click
      131. 1 expect(page).to have_content(books.last.title)
      132. end
      133. end
      134. end
      135. 1 describe 'sort' do
      136. 1 shared_examples 'sort test' do
      137. 5 it 'sort books' do
      138. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      139. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      140. 5 create(:book, title: 'Anna', price_cents: 23,
      141. <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs)
      142. 5 visit books_path
      143. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      144. id: 'menu').click
      145. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      146. 5 click_link button
      147. end
      148. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      149. end
      150. end
      151. 1 context 'when sort by title A to Z' do
      152. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
      153. 2 let(:book_title) { 'Anna' }
      154. 1 include_examples 'sort test'
      155. end
      156. 1 context 'when sort by title Z to A' do
      157. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
      158. 2 let(:book_title) { 'Zimbabwe' }
      159. 1 include_examples 'sort test'
      160. end
      161. 1 context 'when sort by price High to Low' do
      162. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
      163. 2 let(:book_title) { 'Zimbabwe' }
      164. 1 include_examples 'sort test'
      165. end
      166. 1 context 'when sort by price Low to High' do
      167. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
      168. 2 let(:book_title) { 'Anna' }
      169. 1 include_examples 'sort test'
      170. end
      171. 1 context 'when sort by newest' do
      172. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
      173. 2 let(:book_title) { 'Zimbabwe' }
      174. 1 include_examples 'sort test'
      175. end
      176. end
      177. end
      <<<<<<< HEAD =======

      spec/feature/cart_spec.rb

      96.55% lines covered

      29 relevant lines. 28 lines covered and 1 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end
      >>>>>>> 366b257 (Fix)

      spec/feature/home_spec.rb

      100.0% lines covered

      49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> c7a726c5 (Rebased) 100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= ======= >>>>>>> c7a726c5 (Rebased) 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 28 relevant lines. 28 lines covered and ======= 30 relevant lines. 30 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe 'Review', type: :feature do ======= require_relative '../rails_helper' >>>>>>> c7a726c5 (Rebased)
      2. 1 <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= require_relative '../support/shared_context' >>>>>>> c7a726c5 (Rebased)
      3. <<<<<<< HEAD
      4. 1 include_context 'with api request global before and after hooks'
      5. =======
      6. >>>>>>> c7a726c5 (Rebased)
      7. <<<<<<< HEAD
      8. 3 =======
      9. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:user) { create(:user).decorate } ======= RSpec.describe 'Review', type: :feature do >>>>>>> c7a726c5 (Rebased)
      10. <<<<<<< HEAD
      11. 3 =======
      12. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD let(:book) { create(:book).decorate } ======= include_context 'with api request authentication helper methods'
      13. 1 include_context 'with api request global before and after hooks' >>>>>>> c7a726c5 (Rebased)
      14. <<<<<<< HEAD
      15. 1 =======
      16. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD before do ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> c7a726c5 (Rebased)
      17. <<<<<<< HEAD
      18. 2 =======
      19. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD sign_in(user) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> c7a726c5 (Rebased)
      20. <<<<<<< HEAD
      21. =======
      22. 1 before do
      23. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD visit book_path(book)
      24. end ======= sign_in(user) >>>>>>> c7a726c5 (Rebased)
      25. <<<<<<< HEAD
      26. 1 shared_examples 'review' do
      27. =======
      28. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD it 'review' do ======= visit book_path(book) >>>>>>> c7a726c5 (Rebased)
      29. <<<<<<< HEAD
      30. 2 =======
      31. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD find('i', id: rating).click ======= end >>>>>>> c7a726c5 (Rebased)
      32. <<<<<<< HEAD
      33. =======
      34. >>>>>>> c7a726c5 (Rebased)
      35. <<<<<<< HEAD =======
      36. 1 shared_examples 'review' do
      37. >>>>>>> c7a726c5 (Rebased)
      38. 2 <<<<<<< HEAD fill_in :title, with: FFaker::Lorem.sentence(title_words) ======= it 'review' do >>>>>>> c7a726c5 (Rebased)
      39. 2 <<<<<<< HEAD fill_in :body, with: FFaker::Lorem.sentence(body_words) ======= find('i', id: rating).click >>>>>>> c7a726c5 (Rebased)
      40. 2 <<<<<<< HEAD click_on I18n.t('review.post') ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> c7a726c5 (Rebased)
      41. <<<<<<< HEAD
      42. =======
      43. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      44. >>>>>>> c7a726c5 (Rebased)
      45. <<<<<<< HEAD
      46. =======
      47. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD expect(page).to have_content(result)
      48. end ======= click_on I18n.t('review.post') >>>>>>> c7a726c5 (Rebased)
      49. <<<<<<< HEAD =======
      50. 2 expect(page).to have_content(result)
      51. end
      52. >>>>>>> c7a726c5 (Rebased) end
      53. <<<<<<< HEAD
      54. =======
      55. >>>>>>> c7a726c5 (Rebased)
      56. <<<<<<< HEAD
      57. =======
      58. >>>>>>> c7a726c5 (Rebased) 1 describe '#post review', js: true do
      59. <<<<<<< HEAD
      60. =======
      61. >>>>>>> c7a726c5 (Rebased) 1 context 'when review posted' do
      62. <<<<<<< HEAD
      63. =======
      64. >>>>>>> c7a726c5 (Rebased) 2 let(:rating) { "star#{rand(1..5)}" }
      65. <<<<<<< HEAD
      66. =======
      67. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:title_words) { 3 } ======= let(:title_words) { 5 } >>>>>>> c7a726c5 (Rebased)
      68. <<<<<<< HEAD
      69. =======
      70. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD let(:body_words) { 5 } ======= let(:body_words) { 10 } >>>>>>> c7a726c5 (Rebased)
      71. <<<<<<< HEAD
      72. =======
      73. >>>>>>> c7a726c5 (Rebased) 2 let(:result) { user.name_or_email }
      74. <<<<<<< HEAD
      75. 1 include_examples 'review'
      76. end
      77. ======= >>>>>>> c7a726c5 (Rebased)
      78. 1 <<<<<<< HEAD context 'when review not been posted' do
      79. 2 let(:rating) { "star#{rand(1..5)}" }
      80. 2 let(:title_words) { 80 }
      81. 2 let(:body_words) { 30 }
      82. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      83. 1 ======= >>>>>>> c7a726c5 (Rebased) include_examples 'review'
      84. <<<<<<< HEAD
      85. =======
      86. >>>>>>> c7a726c5 (Rebased) end
      87. <<<<<<< HEAD =======
      88. 1 context 'when review not been posted' do
      89. 2 let(:rating) { "star#{rand(1..5)}" }
      90. 2 let(:title_words) { 80 }
      91. 2 let(:body_words) { 30 }
      92. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      93. >>>>>>> c7a726c5 (Rebased)
      94. <<<<<<< HEAD =======
      95. 1 include_examples 'review'
      96. end
      97. >>>>>>> c7a726c5 (Rebased) end
      98. <<<<<<< HEAD
      99. =======
      100. >>>>>>> c7a726c5 (Rebased) end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe AdminUser, type: :model do
      3. 1 context 'when validations' do
      4. 2 <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) }
      6. end
      7. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= RSpec.describe Author, type: :model do >>>>>>> c7a726c5 (Rebased)
      2. <<<<<<< HEAD
      3. 2 =======
      4. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= describe 'author' do
      5. 1 context 'when validations' do
      6. 2 it { is_expected.to validate_presence_of(:first_name) }
      7. 2 it { is_expected.to validate_presence_of(:last_name) }
      8. end >>>>>>> c7a726c5 (Rebased)
      9. end
      10. end

      spec/models/author_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Author, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:first_name) }
      5. 2 it { is_expected.to validate_presence_of(:last_name) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      10. end
      11. end
      12. end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe AuthorsBook, type: :model do
      2. 1 describe 'authors_book' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:author) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:author) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Book, type: :model do
      2. 1 describe 'books' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:title) }
      5. 2 it { is_expected.to validate_presence_of(:description) }
      6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
      7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
      8. 2 it { is_expected.to validate_presence_of(:quantity) }
      9. 2 it { is_expected.to validate_presence_of(:materials) }
      10. 2 it { is_expected.to validate_presence_of(:dimensions) }
      11. end
      12. 1 context 'when associations' do
      13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
      18. end
      19. end
      20. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do
      3. 1 describe 'review' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:title) }
      6. 2 it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) }
      7. end
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. 3 let(:titles) { %w[Adam Zimbabwe] }
      10. 1 let(:books_dates) do
      11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
      12. end
      13. 1 describe 'all books sort' do
      14. 1 context 'when sort by title A to Z' do
      15. 1 let(:books) do
      16. 1 create(:book, title: titles.first)
      17. 1 create(:book, title: titles.second)
      18. end
      19. 2 let(:result) { titles.second }
      20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      21. 1 include_examples 'sort test'
      22. end
      23. 1 context 'when sort title Z to A' do
      24. 1 let(:books) do
      25. 1 create(:book, title: titles.first)
      26. 1 create(:book, title: titles.second)
      27. end
      28. 2 let(:result) { titles.first }
      29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      30. 1 include_examples 'sort test'
      31. end
      32. 1 context 'when sort by price High to Low' do
      33. 1 let(:books) do
      34. 1 create(:book, price_cents: 75)
      35. 1 create(:book, price_cents: 23)
      36. end
      37. 2 let(:result) { 75 }
      38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      39. 1 include_examples 'sort test'
      40. end
      41. 1 context 'when sort price Low to High' do
      42. 1 let(:books) do
      43. 1 create(:book, price_cents: 75)
      44. 1 create(:book, price_cents: 23)
      45. end
      46. 2 let(:result) { 23 }
      47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      48. 1 include_examples 'sort test'
      49. end
      50. 1 context 'when sort by Newest' do
      51. 1 let(:books) do
      52. 1 create(:book, created_at: books_dates.first)
      53. 1 create(:book, created_at: books_dates.second)
      54. end
      55. 2 let(:result) { books_dates.first }
      56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      57. 1 include_examples 'sort test'
      58. end
      59. end
      60. end

      spec/support/configs/capybara.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
          
      1. 1 RSpec.describe 'Author' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD
      5. 2 let(:first_name) { FFaker::Name.first_name }
      6. 2 let(:last_name) { FFaker::Name.last_name }
      7. 2 let(:new_name) { FFaker::Name.first_name }
      8. 2 let(:old_name) { author.first_name }
      9. 4 let(:author) { create(:author) }
      10. 1 before do
      11. 4 sign_in(create(:admin_user), :admin_user)
      12. end
      13. 1 it 'can create an author' do
      14. 1 visit 'admin/authors'
      15. 1 click_link('New Author')
      16. 1 fill_in 'author[first_name]', with: first_name
      17. 1 fill_in 'author[last_name]', with: last_name
      18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      19. end
      20. 1 it 'can delete an author' do
      21. 1 author
      22. 1 visit 'admin/authors'
      23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      24. end
      25. 1 it 'can view an author' do
      26. 1 author
      27. 1 visit 'admin/authors'
      28. 1 click_link('View')
      29. 1 expect(page).to have_content(author.first_name)
      30. end
      31. 1 it 'can edit an author' do
      32. 1 author
      33. 1 visit 'admin/authors'
      34. 1 click_link('Edit')
      35. 1 fill_in 'author[first_name]', with: new_name
      36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      37. end
      38. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      43 relevant lines. 43 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD
      5. 7 =======
      6. =======
      7. >>>>>>> d0dc1f1 (Featire specs) =======
      8. >>>>>>> 752f0c0 (Featire specs) 5 >>>>>>> 93bdda9 (Featire specs) =======
      9. 7 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      10. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { create(:book) } >>>>>>> 872e675 (Fix) ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= let(:category_two) { FactoryBot.create(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      11. 1 let(:params) do
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      13. 1 =======
      14. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      15. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      16. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      17. 4 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) { title: FFaker::Book.title,
      18. description: FFaker::Book.description,
      19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      20. dimensions: FFaker::Book.cover,
      21. year_of_publication: FFaker::Number.rand(1900..2022),
      22. materials: 'Soft cover',
      23. quantity: FFaker::Number.rand(2..5) }
      24. end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      26. 1 before do
      27. 6 sign_in(create(:admin_user), :admin_user)
      28. 6 book
      29. 6 visit 'admin/books'
      30. end
      31. 1 it 'can create an category' do
      32. 1 click_link('New Book')
      33. 1 fill_in 'book[title]', with: params[:title]
      34. 1 fill_in 'book[description]', with: params[:description]
      35. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      36. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      37. 1 fill_in 'book[materials]', with: params[:materials]
      38. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      39. 1 fill_in 'book[quantity]', with: params[:quantity]
      40. 1 click_button('Create Book')
      41. 1 expect(page).to have_content(params[:title])
      42. end
      43. 1 it 'can delete an book' do
      44. 1 click_link('Delete')
      45. 1 expect(page).not_to have_content(book.title)
      46. end
      47. 1 it 'can view an book' do
      48. 1 click_link('View')
      49. 1 expect(page).to have_content(book.title)
      50. end
      51. 1 it 'can edit an book' do
      52. 1 click_link('Edit')
      53. 1 fill_in 'book[title]', with: 'New title'
      54. 1 click_button('Update Book')
      55. 1 expect(page).to have_content('New title')
      56. end
      57. 1 context 'when image' do
      58. 1 before do
      59. 2 click_link('Edit')
      60. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
      61. 2 click_on 'Update Book'
      62. end
      63. 1 it 'can add images to book' do
      64. 1 expect(book.reload.images.count).to eq(1)
      65. end
      66. 1 it 'can delete images from book' do
      67. 1 click_link('Edit')
      68. 1 click_link('Delete')
      69. 1 expect(book.reload.images.count).to eq(0)
      70. end
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      13. 7 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can create an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      15. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('New Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      17. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      18. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      19. 1 visit "books/#{book.id}"
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      21. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      23. =======
      24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      25. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      26. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      28. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: category_name >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      32. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      33. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      34. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      35. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      36. 1 click_button('Create Category') <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      37. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category_name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      39. =======
      40. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      41. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      42. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      43. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      44. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can delete an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      46. 1 click_link('Delete')
      47. <<<<<<< HEAD <<<<<<< HEAD =======
      48. >>>>>>> d0dc1f1 (Featire specs) =======
      49. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      50. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      53. =======
      54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      55. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      56. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      57. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('Catalog')
      59. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).not_to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      62. =======
      63. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      64. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      65. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      66. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      67. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can view an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      68. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('View') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      69. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content(category.name) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      71. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD it 'can edit an category' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_link('Edit') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      73. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD click_button('Update Category') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      77. 1 =======
      78. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      80. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      81. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD expect(page).to have_content('New Genre') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) end
      83. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs)
      5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link I18n.t('book_page.read_more')
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      36. >>>>>>> d0dc1f1 (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      38. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      39. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      40. >>>>>>> 4e81ea2 (Featire specs) =======
      41. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      42. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 context 'when quantity changes', js: true do
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      44. =======
      45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      46. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      47. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      50. >>>>>>> 4e81ea2 (Featire specs) =======
      51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 before do
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      55. 2 visit "books/#{book.id}"
      56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      57. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'inc').click >>>>>>> 5b7749a (Fix)
      58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      61. 1 =======
      62. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      63. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      64. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      66. 2 >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD
      67. 2 >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
      68. 2 >>>>>>> e3e66f3 (Featire specs) =======
      69. 1 >>>>>>> 5b7749a (Fix) it 'increase quantity' do
      70. <<<<<<< HEAD
      71. end
      72. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= =======
      73. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'increase quantity' do >>>>>>> 872e675 (Fix) ======= it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= =======
      77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      79. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      80. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      81. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      83. >>>>>>> d0dc1f1 (Featire specs) =======
      84. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      85. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      86. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      87. >>>>>>> 4e81ea2 (Featire specs) =======
      88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      93. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      94. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      95. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      96. >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      98. >>>>>>> 5b7749a (Fix)
      99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      100. =======
      101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      102. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      103. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      105. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= it 'decrease quantity' do >>>>>>> 872e675 (Fix) ======= it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'decrease quantity' do >>>>>>> 5b7749a (Fix)
      109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      110. =======
      111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      112. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      113. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      116. >>>>>>> 4e81ea2 (Featire specs) =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      118. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dec').click ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
      119. end
      120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dec').click >>>>>>> 5b7749a (Fix)
      121. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity', js: true do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      122. 1 find('a', class: 'dec').click
      123. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) expect(page).to have_content("€#{book.price}")
      124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      125. end
      126. end
      127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      130. end
      131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      133. 1 describe '#catalog' do
      134. 1 describe 'filter by category' do
      135. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      136. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe '#catalog' do
      137. 1 describe 'filter by category' do
      138. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) before do
      139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      140. =======
      141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      142. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      143. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      145. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      146. >>>>>>> 4e81ea2 (Featire specs) =======
      147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      149. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      150. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      151. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      152. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      153. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      154. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      156. =======
      157. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      158. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      159. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      161. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      162. >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      165. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      166. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      167. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      168. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      169. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      170. >>>>>>> 5b7749a (Fix) 2 visit books_path
      171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      172. =======
      173. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      174. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      175. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      176. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      177. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      178. >>>>>>> 4e81ea2 (Featire specs) =======
      179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      186. >>>>>>> 5b7749a (Fix) end
      187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      188. =======
      189. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      190. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      191. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      193. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      194. >>>>>>> 4e81ea2 (Featire specs) =======
      195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      197. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      198. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      199. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      200. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      201. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      202. >>>>>>> 5b7749a (Fix)
      203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      204. =======
      205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      206. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      207. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      208. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      209. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      210. >>>>>>> 4e81ea2 (Featire specs) =======
      211. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      212. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      214. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 5b7749a (Fix) 1 after do
      219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      220. =======
      221. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      222. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      223. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      225. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      226. >>>>>>> 4e81ea2 (Featire specs) =======
      227. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      228. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      229. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      230. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      231. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      232. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      233. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      234. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      235. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      236. =======
      237. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      239. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      240. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      241. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      242. >>>>>>> 4e81ea2 (Featire specs) =======
      243. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      244. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      246. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      249. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      250. >>>>>>> 5b7749a (Fix) end
      251. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      252. =======
      253. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      254. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      255. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      258. >>>>>>> 4e81ea2 (Featire specs) =======
      259. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      260. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      262. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      266. >>>>>>> 5b7749a (Fix)
      267. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      268. =======
      269. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      270. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      271. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      272. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      273. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      274. >>>>>>> 4e81ea2 (Featire specs) =======
      275. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      276. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      278. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      282. >>>>>>> 5b7749a (Fix) 1 it 'show book count for category' do
      283. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      284. =======
      285. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      286. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      287. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      289. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      290. >>>>>>> 4e81ea2 (Featire specs) =======
      291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      294. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      295. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      296. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      297. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      298. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.size)
      299. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      300. =======
      301. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      302. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      303. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      305. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      306. >>>>>>> 4e81ea2 (Featire specs) =======
      307. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      310. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      314. >>>>>>> 5b7749a (Fix) end
      315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      316. =======
      317. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      318. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      319. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      320. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      321. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      322. >>>>>>> 4e81ea2 (Featire specs) =======
      323. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      324. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      326. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      328. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      329. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      330. >>>>>>> 5b7749a (Fix)
      331. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      332. 1 it 'filter book by category' do
      333. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      334. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      335. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'filter book by category' do
      336. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      337. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) click_on category_one.name
      338. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      339. =======
      340. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      341. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      342. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      343. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      344. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      345. >>>>>>> 4e81ea2 (Featire specs) =======
      346. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      348. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      349. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      350. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      351. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      352. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      353. >>>>>>> 5b7749a (Fix) end
      354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      355. =======
      356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      357. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      358. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      361. >>>>>>> 4e81ea2 (Featire specs) =======
      362. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      363. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      367. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      368. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      369. >>>>>>> 5b7749a (Fix)
      370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      371. =======
      372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      373. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      374. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      375. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      376. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      377. >>>>>>> 4e81ea2 (Featire specs) =======
      378. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      380. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      381. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      382. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      383. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      384. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      385. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      386. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      387. =======
      388. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      389. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      390. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      391. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      393. >>>>>>> 4e81ea2 (Featire specs) =======
      394. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      395. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      396. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      397. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      398. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      399. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      400. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      401. >>>>>>> 5b7749a (Fix) end
      402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      403. =======
      404. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      405. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      406. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      407. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      408. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      409. >>>>>>> 4e81ea2 (Featire specs) =======
      410. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      411. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      412. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      413. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      415. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      416. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      417. >>>>>>> 5b7749a (Fix) end
      418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      419. =======
      420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      421. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      422. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      424. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      425. >>>>>>> 4e81ea2 (Featire specs) =======
      426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      431. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      432. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      433. >>>>>>> 5b7749a (Fix)
      434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      435. =======
      436. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      437. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      439. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      440. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      441. >>>>>>> 4e81ea2 (Featire specs) =======
      442. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      443. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      444. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      445. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      446. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      447. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      448. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      449. >>>>>>> 5b7749a (Fix) 1 describe 'filter by all books' do
      450. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      451. =======
      452. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      454. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      455. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      456. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      457. >>>>>>> 4e81ea2 (Featire specs) =======
      458. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      461. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      465. >>>>>>> 5b7749a (Fix) 1 before do
      466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      467. =======
      468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      469. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      470. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      472. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      473. >>>>>>> 4e81ea2 (Featire specs) =======
      474. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      475. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      479. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      480. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      481. >>>>>>> 5b7749a (Fix) 2 category_one.books.create(params)
      482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      483. 2 category_two.books.create(params)
      484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= click_on I18n.t('catalog_page.all') >>>>>>> 5b7749a (Fix)
      487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      488. 2 click_on 'All'
      489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      491. =======
      492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      493. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      494. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      495. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      496. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      497. >>>>>>> 4e81ea2 (Featire specs) =======
      498. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      501. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      505. >>>>>>> 5b7749a (Fix)
      506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      507. =======
      508. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      509. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      510. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      511. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      512. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      513. >>>>>>> 4e81ea2 (Featire specs) =======
      514. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      515. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      517. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      519. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      520. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      521. >>>>>>> 5b7749a (Fix) 1 after do
      522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      523. =======
      524. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      525. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      526. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      527. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      528. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      529. >>>>>>> 4e81ea2 (Featire specs) =======
      530. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      531. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      532. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      533. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      534. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      535. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      536. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      537. >>>>>>> 5b7749a (Fix) 2 category_one.destroy
      538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      539. =======
      540. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      541. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      542. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      545. >>>>>>> 4e81ea2 (Featire specs) =======
      546. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      547. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      548. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      549. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      550. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      551. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      552. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      553. >>>>>>> 5b7749a (Fix) 2 category_two.destroy
      554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      555. =======
      556. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      557. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      558. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      559. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      561. >>>>>>> 4e81ea2 (Featire specs) =======
      562. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      563. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      567. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      568. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      569. >>>>>>> 5b7749a (Fix) end
      570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      571. =======
      572. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      573. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      574. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      576. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      577. >>>>>>> 4e81ea2 (Featire specs) =======
      578. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      579. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      583. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      584. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      585. >>>>>>> 5b7749a (Fix)
      586. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      587. =======
      588. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      589. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      590. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      593. >>>>>>> 4e81ea2 (Featire specs) =======
      594. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      595. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      596. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      597. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      598. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      599. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      600. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      601. >>>>>>> 5b7749a (Fix) 1 it 'shown books for first category' do
      602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      603. =======
      604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      605. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      606. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      607. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      608. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      609. >>>>>>> 4e81ea2 (Featire specs) =======
      610. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      611. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      612. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      613. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      614. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      615. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      616. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      617. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_one.books.first.title)
      618. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      619. =======
      620. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      621. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      622. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      623. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      624. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      625. >>>>>>> 4e81ea2 (Featire specs) =======
      626. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      628. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      629. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      630. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      631. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      632. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      633. >>>>>>> 5b7749a (Fix) end
      634. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      635. =======
      636. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      637. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      638. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      641. >>>>>>> 4e81ea2 (Featire specs) =======
      642. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      643. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      644. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      645. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      646. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      647. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      648. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      649. >>>>>>> 5b7749a (Fix)
      650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      651. =======
      652. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      653. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      654. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      656. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      657. >>>>>>> 4e81ea2 (Featire specs) =======
      658. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      660. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      661. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      662. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      663. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      664. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      665. >>>>>>> 5b7749a (Fix) 1 it 'shown books for second category' do
      666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      667. =======
      668. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      669. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      670. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      671. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      672. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      673. >>>>>>> 4e81ea2 (Featire specs) =======
      674. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      676. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      678. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      680. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      681. >>>>>>> 5b7749a (Fix) 1 expect(page).to have_content(category_two.books.first.title)
      682. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      683. end
      684. end
      685. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      686. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      688. end
      689. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      690. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      691. =======
      692. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      693. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      694. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      695. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      696. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      697. >>>>>>> 4e81ea2 (Featire specs) =======
      698. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      699. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      703. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      704. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      705. >>>>>>> 5b7749a (Fix) 1 describe 'load_more' do
      706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      707. =======
      708. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      709. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      710. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      712. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      713. >>>>>>> 4e81ea2 (Featire specs) =======
      714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      716. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      717. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      718. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      719. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      720. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      721. >>>>>>> 5b7749a (Fix) 1 before do
      722. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      723. =======
      724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      725. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      726. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      727. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      728. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      729. >>>>>>> 4e81ea2 (Featire specs) =======
      730. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      731. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      732. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      733. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      734. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      735. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      736. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 5b7749a (Fix) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= 24.times do >>>>>>> 872e675 (Fix) ======= 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 5b7749a (Fix)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      739. =======
      740. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      741. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      742. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      743. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      744. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      745. >>>>>>> 4e81ea2 (Featire specs) =======
      746. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      747. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      748. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      749. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      750. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      751. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      752. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      753. >>>>>>> 5b7749a (Fix) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) books << create(:book)
      754. end
      755. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      756. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      758. 4 =======
      759. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      760. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      761. 4 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      762. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      763. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      765. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      767. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      768. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      769. 4 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 5b7749a (Fix)
      770. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      771. 1 =======
      772. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      773. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      774. 1 >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      775. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      776. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      777. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      778. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      779. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      780. 4 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      781. 4 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      782. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:books) { [] } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books without view more button' do >>>>>>> 5b7749a (Fix)
      783. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      784. 1 visit books_path
      785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      786. >>>>>>> d0dc1f1 (Featire specs) =======
      787. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= =======
      788. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= =======
      789. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      790. >>>>>>> 4e81ea2 (Featire specs) =======
      791. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      792. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      793. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      794. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      795. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      796. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      797. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      799. 1 it 'show books without view more button' do
      800. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      801. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      802. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 5b7749a (Fix)
      803. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      804. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      805. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      807. =======
      808. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      809. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      810. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      811. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      812. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      813. >>>>>>> 4e81ea2 (Featire specs) =======
      814. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      815. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      816. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      817. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      818. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      819. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      820. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      821. >>>>>>> 5b7749a (Fix)
      822. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      823. 1 context 'when view more' do
      824. 1 it 'show books with view more button' do
      825. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      826. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 5b7749a (Fix)
      827. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      828. =======
      829. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      830. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      831. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      832. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      833. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      835. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      836. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      837. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      838. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      839. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'show books with view more button' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      840. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_css('a', class: 'view_more') >>>>>>> 5b7749a (Fix)
      841. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      842. 1 expect(page).to have_css('a', class: 'view_more')
      843. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      844. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      845. =======
      846. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      847. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      848. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      850. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      851. >>>>>>> 4e81ea2 (Featire specs) =======
      852. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      853. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      854. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      855. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      856. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      857. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      858. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      859. >>>>>>> 5b7749a (Fix)
      860. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      861. =======
      862. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      863. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      864. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      866. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      867. >>>>>>> 4e81ea2 (Featire specs) =======
      868. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      870. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      871. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      872. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      873. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      874. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      875. >>>>>>> 5b7749a (Fix) 1 it 'show loaded books', js: true do
      876. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      877. 1 visit books_path
      878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      879. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit books_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= find('a', class: 'view_more').click >>>>>>> 5b7749a (Fix)
      880. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 5b7749a (Fix)
      881. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      882. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      883. =======
      884. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      885. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      886. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      887. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      888. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      889. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      890. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      891. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      892. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      893. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      894. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      895. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 5b7749a (Fix)
      896. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) end
      897. end
      898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      899. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      900. =======
      901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      902. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      903. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      904. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      905. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      906. >>>>>>> 4e81ea2 (Featire specs) =======
      907. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      908. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      909. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      910. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      911. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      912. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      913. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      914. >>>>>>> 5b7749a (Fix) 1 describe 'sort' do
      915. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      916. =======
      917. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      918. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      919. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      920. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      921. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      922. >>>>>>> 4e81ea2 (Featire specs) =======
      923. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      924. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      925. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      926. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      927. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      928. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      929. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      930. >>>>>>> 5b7749a (Fix) 1 shared_examples 'sort test' do
      931. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      932. =======
      933. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      934. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      935. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      937. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      938. >>>>>>> 4e81ea2 (Featire specs) =======
      939. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      941. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      942. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      943. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      944. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      945. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      946. >>>>>>> 5b7749a (Fix) 5 it 'sort books' do
      947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      948. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      949. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      950. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      951. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 5b7749a (Fix)
      952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 872e675 (Fix) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 5b7749a (Fix)
      953. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      954. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      955. ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      956. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      957. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      958. >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      959. >>>>>>> 5b7749a (Fix)
      960. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      961. =======
      962. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      963. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      964. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      965. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      966. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      967. >>>>>>> 4e81ea2 (Featire specs) =======
      968. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      969. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      970. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      971. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      972. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      973. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      974. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      975. >>>>>>> 5b7749a (Fix) 5 visit books_path
      976. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      977. =======
      978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      979. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      980. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      981. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      982. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      983. >>>>>>> 4e81ea2 (Featire specs) =======
      984. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      985. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      986. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      987. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      988. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      989. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      990. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      991. >>>>>>> 5b7749a (Fix)
      992. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      993. =======
      994. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      995. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      996. >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= =======
      997. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) =======
      998. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      999. >>>>>>> 4e81ea2 (Featire specs) =======
      1000. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      1002. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1004. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1005. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1006. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1007. >>>>>>> 5b7749a (Fix) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1008. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      1009. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1010. 5 click_link button
      1011. end
      1012. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1013. end
      1014. end
      1015. 1 context 'when sort by title A to Z' do
      1016. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 5b7749a (Fix)
      1017. 2 let(:book_title) { 'Anna' }
      1018. 1 include_examples 'sort test'
      1019. end
      1020. 1 context 'when sort by title Z to A' do
      1021. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 5b7749a (Fix)
      1022. 2 let(:book_title) { 'Zimbabwe' }
      1023. 1 include_examples 'sort test'
      1024. end
      1025. 1 context 'when sort by price High to Low' do
      1026. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 5b7749a (Fix)
      1027. 2 let(:book_title) { 'Zimbabwe' }
      1028. 1 include_examples 'sort test'
      1029. end
      1030. 1 context 'when sort by price Low to High' do
      1031. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 5b7749a (Fix)
      1032. 2 let(:book_title) { 'Anna' }
      1033. 1 include_examples 'sort test'
      1034. end
      1035. 1 context 'when sort by newest' do
      1036. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 5b7749a (Fix)
      1037. 2 let(:book_title) { 'Zimbabwe' }
      1038. 1 include_examples 'sort test'
      1039. end
      1040. end
      1041. end

      spec/feature/cart_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe 'Cart', type: :feature, js: true do
      3. 5 let(:book) { FactoryBot.create(:book) }
      4. 1 before do
      5. 4 book
      6. 4 visit book_path(book.id)
      7. 4 click_button I18n.t('book_page.add_to_card')
      8. end
      9. 1 describe '#add_book_to_order' do
      10. 1 it 'add book to order' do
      11. 1 within('span', class: 'shop-icon') do
      12. 1 expect(page).to have_content(1)
      13. end
      14. end
      15. end
      16. 1 describe '#quantity_change' do
      17. 1 it 'book quantity inc' do
      18. 1 visit orders_path
      19. 1 within("a#inc#{book.id}.input-link") do
      20. 1 find('i.fa.fa-plus.line-heaght-40').click
      21. end
      22. 1 sleep(2)
      23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
      24. end
      25. 1 it 'book quantity dec' do
      26. 1 visit orders_path
      27. 1 within("a#dec#{book.id}.input-link") do
      28. 1 find('i.fa.fa-minus.line-heaght-40').click
      29. end
      30. 1 sleep(2)
      31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
      32. end
      33. end
      34. 1 describe '#remove_book_from_cart' do
      35. 1 it 'book quantity change' do
      36. 1 visit orders_path
      37. 1 find('button.close.general-cart-close').click
      38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
      39. end
      40. end
      41. end

      spec/feature/coupon_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 5 let(:user) { FactoryBot.create(:user) }
      7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
      8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
      9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
      10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
      11. 1 before do
      12. 4 sign_in(user)
      13. 4 order
      14. 4 order_book
      15. 4 visit orders_path
      16. end
      17. 1 describe '#valid coupon' do
      18. 1 before do
      19. 3 fill_in 'input', with: coupon.code
      20. 3 click_button I18n.t('order.apply')
      21. end
      22. 1 it 'sub price' do
      23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
      24. end
      25. 1 it 'use coupon' do
      26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
      27. end
      28. 1 it 'count price with coupon' do
      29. 1 expect(page).to have_content('Order Total: € 10.49')
      30. end
      31. end
      32. 1 describe '#invalid coupon' do
      33. 1 it 'show error message' do
      34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
      35. 1 click_button I18n.t('order.apply')
      36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
      37. end
      38. end
      39. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      >>>>>>> a5d032d (Fix) 100.0% lines covered

      <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      28 relevant lines. 28 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Review', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 3 let(:user) { create(:user).decorate }
      5. 3 let(:book) { create(:book).decorate }
      6. 1 before do
      7. 2 sign_in(user)
      8. 2 visit book_path(book)
      9. end
      10. 1 shared_examples 'review' do
      11. 2 it 'review' do
      12. 2 find('i', id: rating).click
      13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      15. 2 click_on I18n.t('review.post')
      16. 2 expect(page).to have_content(result)
      17. end
      18. end
      19. 1 describe '#post review', js: true do
      20. 1 context 'when review posted' do
      21. 2 let(:rating) { "star#{rand(1..5)}" }
      22. 2 let(:title_words) { 3 }
      23. 2 let(:body_words) { 5 }
      24. 2 let(:result) { user.name_or_email }
      25. 1 include_examples 'review'
      26. end
      27. 1 context 'when review not been posted' do
      28. 2 let(:rating) { "star#{rand(1..5)}" }
      29. 2 let(:title_words) { 80 }
      30. 2 let(:body_words) { 30 }
      31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      32. 1 include_examples 'review'
      33. end
      34. end
      35. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe AdminUser, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 5b7749a (Fix)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 2 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:email) } >>>>>>> 5b7749a (Fix)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 2 =======
      18. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 1 >>>>>>> 752f0c0 (Featire specs) =======
      20. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 2 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= visit root_path >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:password) } >>>>>>> 5b7749a (Fix)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 1 context 'when associations' do
      30. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      31. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      32. end
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. <<<<<<< HEAD
      37. 1 describe 'navbar' do
      38. 2 let(:books_category) { FactoryBot.create(:books_category) }
      39. 1 it 'on click home move to root-path' do
      40. 1 visit books_path
      41. 1 find('a', id: 'root').click
      42. 1 expect(page).to have_content('Get Started')
      43. end
      44. 1 it 'on click category name move to root-path with books that belong to this category' do
      45. 1 books_category
      46. 1 visit root_path
      47. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      48. 1 within('ul', id: 'nav') do
      49. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      50. end
      51. 1 expect(page).to have_content(books_category.category.books.first.title)
      52. end
      53. end
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 5b7749a (Fix) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD =======
      9. >>>>>>> d0dc1f1 (Featire specs) =======
      10. >>>>>>> 752f0c0 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 08edf50 (Featire specs) =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      18. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      19. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      21. =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      27. >>>>>>> 08edf50 (Featire specs) =======
      28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      31. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      32. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      33. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 5b7749a (Fix)
      34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      35. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      36. 1 describe 'author' do
      37. 1 context 'when validations' do
      38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      39. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:authors_books).dependent(:destroy) } >>>>>>> 5b7749a (Fix)
      40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      41. =======
      42. >>>>>>> d0dc1f1 (Featire specs) =======
      43. >>>>>>> 752f0c0 (Featire specs) =======
      44. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      47. >>>>>>> 08edf50 (Featire specs) =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      52. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:books).through(:authors_books) } >>>>>>> 5b7749a (Fix)
      54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      55. =======
      56. >>>>>>> d0dc1f1 (Featire specs) =======
      57. >>>>>>> 752f0c0 (Featire specs) =======
      58. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      59. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      63. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      64. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      65. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      66. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      67. >>>>>>> 5b7749a (Fix) end
      68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      69. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      70. 1 context 'when associations' do
      71. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      72. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      73. end
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      75. >>>>>>> 5b7749a (Fix) end
      76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. =======
      78. >>>>>>> d0dc1f1 (Featire specs) =======
      79. >>>>>>> 752f0c0 (Featire specs) =======
      80. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      83. >>>>>>> 08edf50 (Featire specs) =======
      84. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      85. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      86. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      87. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      88. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      89. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 5b7749a (Fix) ======= 8 relevant lines. 8 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      4. =======
      5. >>>>>>> d0dc1f1 (Featire specs) =======
      6. >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      10. >>>>>>> 08edf50 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      14. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      15. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 5b7749a (Fix) =======
      17. >>>>>>> c7a726c5 (Rebased) 1 describe 'authors_book' do
      18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      19. =======
      20. >>>>>>> d0dc1f1 (Featire specs) =======
      21. >>>>>>> 752f0c0 (Featire specs) =======
      22. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      25. >>>>>>> 08edf50 (Featire specs) =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      29. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      30. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      31. >>>>>>> 5b7749a (Fix) =======
      32. >>>>>>> c7a726c5 (Rebased) 1 context 'when validations' do
      33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      34. 2 it { is_expected.to validate_presence_of(:book) }
      35. 2 it { is_expected.to validate_presence_of(:author) }
      36. end
      37. 1 context 'when associations' do
      38. 2 it { is_expected.to belong_to(:author) }
      39. <<<<<<< HEAD 2 it { is_expected.to belong_to(:book) }
      40. end
      41. end
      42. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 5b7749a (Fix)
      8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 5b7749a (Fix)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD =======
      14. >>>>>>> d0dc1f1 (Featire specs) =======
      15. >>>>>>> 752f0c0 (Featire specs) =======
      16. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      19. >>>>>>> 08edf50 (Featire specs) =======
      20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      21. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      23. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) end
      25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      26. =======
      27. >>>>>>> d0dc1f1 (Featire specs) =======
      28. >>>>>>> 752f0c0 (Featire specs) =======
      29. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      32. >>>>>>> 08edf50 (Featire specs) =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      37. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      40. 1 context 'when not validations' do
      41. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      42. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      43. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      44. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      45. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      46. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      47. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      48. end
      49. <<<<<<< HEAD =======
      50. >>>>>>> d0dc1f1 (Featire specs) =======
      51. >>>>>>> 752f0c0 (Featire specs) =======
      52. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 08edf50 (Featire specs) =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      59. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      60. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 1 context 'when associations' do
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      62. =======
      63. >>>>>>> d0dc1f1 (Featire specs) =======
      64. >>>>>>> 752f0c0 (Featire specs) =======
      65. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      68. >>>>>>> 08edf50 (Featire specs) =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      72. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      73. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      74. >>>>>>> 5b7749a (Fix) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 5b7749a (Fix)
      75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      76. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      77. ======= >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to belong_to(:book) }
      78. <<<<<<< HEAD
      79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      80. >>>>>>> 5b7749a (Fix) =======
      81. >>>>>>> c7a726c5 (Rebased) end
      82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      83. =======
      84. >>>>>>> d0dc1f1 (Featire specs) =======
      85. >>>>>>> 752f0c0 (Featire specs) =======
      86. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      87. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      88. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      89. >>>>>>> 08edf50 (Featire specs) =======
      90. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      91. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      92. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      93. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      94. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      95. >>>>>>> 5b7749a (Fix) =======
      96. >>>>>>> c7a726c5 (Rebased) end
      97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      98. =======
      99. >>>>>>> d0dc1f1 (Featire specs) =======
      100. >>>>>>> 752f0c0 (Featire specs) =======
      101. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      104. >>>>>>> 08edf50 (Featire specs) =======
      105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      108. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      109. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      110. >>>>>>> 5b7749a (Fix) =======
      111. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. >>>>>>> c7a726c5 (Rebased) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Book, type: :model do >>>>>>> 5b7749a (Fix)
      2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      3. 1 =======
      4. >>>>>>> d0dc1f1 (Featire specs) =======
      5. >>>>>>> 752f0c0 (Featire specs) =======
      6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      7. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      9. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      11. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      12. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      13. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'books' do >>>>>>> 5b7749a (Fix)
      14. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased) RSpec.describe Book, type: :model do
      15. 1 describe 'books' do
      16. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) context 'when validations' do
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      18. 2 it { is_expected.to validate_presence_of(:title) }
      19. 2 it { is_expected.to validate_presence_of(:description) }
      20. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 5b7749a (Fix)
      22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 5b7749a (Fix)
      23. =======
      24. >>>>>>> c7a726c5 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:quantity) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> c7a726c5 (Rebased)
      25. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:materials) } >>>>>>> 5b7749a (Fix)
      26. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
      27. 2 it { is_expected.to validate_presence_of(:materials) }
      28. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:dimensions) }
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 08edf50 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. >>>>>>> 5b7749a (Fix) =======
      43. >>>>>>> c7a726c5 (Rebased) end
      44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45. =======
      46. >>>>>>> d0dc1f1 (Featire specs) =======
      47. >>>>>>> 752f0c0 (Featire specs) =======
      48. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      51. >>>>>>> 08edf50 (Featire specs) =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      53. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 5b7749a (Fix) =======
      58. >>>>>>> c7a726c5 (Rebased)
      59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      60. =======
      61. >>>>>>> d0dc1f1 (Featire specs) =======
      62. >>>>>>> 752f0c0 (Featire specs) =======
      63. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      66. >>>>>>> 08edf50 (Featire specs) =======
      67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      68. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      70. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      71. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      72. >>>>>>> 5b7749a (Fix) =======
      73. >>>>>>> c7a726c5 (Rebased) 1 context 'when associations' do
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      75. =======
      76. >>>>>>> d0dc1f1 (Featire specs) =======
      77. >>>>>>> 752f0c0 (Featire specs) =======
      78. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      79. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      80. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      81. >>>>>>> 08edf50 (Featire specs) =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      83. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      84. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      85. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      86. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      87. >>>>>>> 5b7749a (Fix) =======
      88. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) =======
      92. >>>>>>> 752f0c0 (Featire specs) =======
      93. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      96. >>>>>>> 08edf50 (Featire specs) =======
      97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      100. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      101. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      102. >>>>>>> 5b7749a (Fix) =======
      103. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      105. =======
      106. >>>>>>> d0dc1f1 (Featire specs) =======
      107. >>>>>>> 752f0c0 (Featire specs) =======
      108. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      111. >>>>>>> 08edf50 (Featire specs) =======
      112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      115. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      116. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      117. >>>>>>> 5b7749a (Fix) =======
      118. >>>>>>> c7a726c5 (Rebased)
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      120. =======
      121. >>>>>>> d0dc1f1 (Featire specs) =======
      122. >>>>>>> 752f0c0 (Featire specs) =======
      123. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      124. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      126. >>>>>>> 08edf50 (Featire specs) =======
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      130. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      131. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      132. >>>>>>> 5b7749a (Fix) =======
      133. >>>>>>> c7a726c5 (Rebased) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      135. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      136. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased)
      137. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 5b7749a (Fix) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> c7a726c5 (Rebased)
      138. end
      139. end
      140. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> c7a726c5 (Rebased) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end
      <<<<<<< HEAD

      spec/models/order_spec.rb

      =======

      spec/models/review_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 6 relevant lines. 6 lines covered and >>>>>>> 5b7749a (Fix) ======= 14 relevant lines. 14 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe Order, type: :model do ======= RSpec.describe Review, type: :model do >>>>>>> c7a726c5 (Rebased)
      3. 1 <<<<<<< HEAD describe 'order' do ======= describe 'review' do >>>>>>> c7a726c5 (Rebased)
      4. 1 context 'when associations' do
      5. 2 <<<<<<< HEAD it { is_expected.to have_many(:order_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c7a726c5 (Rebased)
      6. 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:order_books) } ======= it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) } >>>>>>> c7a726c5 (Rebased)
      7. end
      8. end
      9. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe Review, type: :model do >>>>>>> 5b7749a (Fix)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 5b7749a (Fix)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 5b7749a (Fix)
      6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 describe 'author' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:email) }
      5. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix)
      6. end
      7. <<<<<<< HEAD
      8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= context 'with associations' do >>>>>>> c7a726c5 (Rebased)
      9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:billing) } >>>>>>> c7a726c5 (Rebased)
      10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:shipping) } >>>>>>> c7a726c5 (Rebased)
      11. end
      12. end
      13. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======

      spec/queryes/book_query_spec.rb

      >>>>>>> c7a726c5 (Rebased)

      100.0% lines covered

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> c7a726c5 (Rebased) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= RSpec.describe BookQuery do >>>>>>> c7a726c5 (Rebased)
      3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= describe 'category' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= shared_examples 'sort test' do >>>>>>> c7a726c5 (Rebased)
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      5. 5 =======
      6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      7. 1 >>>>>>> 752f0c0 (Featire specs) =======
      8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      13. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      14. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      15. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= it 'sort' do >>>>>>> c7a726c5 (Rebased)
      16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      17. 5 =======
      18. 2 >>>>>>> d0dc1f1 (Featire specs) =======
      19. 2 >>>>>>> 752f0c0 (Featire specs) =======
      20. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      23. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      24. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      25. 2 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      26. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      27. 5 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= books >>>>>>> c7a726c5 (Rebased)
      28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      29. 5 expect(test).to eq(result)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= =======
      36. >>>>>>> 08edf50 (Featire specs) =======
      37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      40. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      41. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      42. 5 >>>>>>> c7a726c5 (Rebased) expect(test).to eq(result)
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      44. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      45. end
      46. <<<<<<< HEAD
      47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      48. >>>>>>> c7a726c5 (Rebased) end
      49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> c7a726c5 (Rebased)
      50. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2fef4a0 (Add login registration pages) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> e60833c (Add login registration pages) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> f416f45 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 2fef4a0 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> e60833c (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> f416f45 (Add login registration pages)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. ======= >>>>>>> 5b7749a (Fix)
      8. 1 context 'with associations' do
      9. 2 it { is_expected.to have_one(:billing) }
      10. 2 it { is_expected.to have_one(:shipping) }
      11. end
      12. end
      13. end

      spec/queryes/book_query_spec.rb

      100.0% lines covered

      45 relevant lines. 45 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe BookQuery do
      3. 1 shared_examples 'sort test' do
      4. 5 it 'sort' do
      5. 5 books
      6. 5 expect(test).to eq(result)
      7. end
      8. end
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      11. 3 =======
      12. >>>>>>> d0dc1f1 (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      16. >>>>>>> 7a02bbe (Featire specs) =======
      17. >>>>>>> 4552227 (Featire specs) =======
      18. 3 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= begin >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 5b7749a (Fix)
      19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books_dates) do >>>>>>> 5b7749a (Fix)
      20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      21. 1 =======
      22. >>>>>>> d0dc1f1 (Featire specs) =======
      23. >>>>>>> 752f0c0 (Featire specs) =======
      24. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      26. >>>>>>> 7a02bbe (Featire specs) =======
      27. >>>>>>> 4552227 (Featire specs) =======
      28. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 5b7749a (Fix)
      29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      30. =======
      31. >>>>>>> d0dc1f1 (Featire specs) =======
      32. >>>>>>> 752f0c0 (Featire specs) =======
      33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      34. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      35. >>>>>>> 08edf50 (Featire specs) =======
      36. >>>>>>> 7a02bbe (Featire specs) =======
      37. >>>>>>> 4552227 (Featire specs) =======
      38. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> 5b7749a (Fix)
      39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs)
      40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      41. exit 1
      42. end
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      44. >>>>>>> 5b7749a (Fix)
      45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      46. 1 describe 'all books sort' do
      47. 1 context 'when sort by title A to Z' do
      48. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      49. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= let(:books) do >>>>>>> 5b7749a (Fix)
      50. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 5b7749a (Fix)
      51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 5b7749a (Fix)
      52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      53. end
      54. 2 let(:result) { titles.second }
      55. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      56. <<<<<<< HEAD =======
      57. >>>>>>> d0dc1f1 (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) =======
      59. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      60. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      61. >>>>>>> 08edf50 (Featire specs) =======
      62. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      63. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= include_examples 'sort test' >>>>>>> 5b7749a (Fix)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      65. end
      66. <<<<<<< HEAD =======
      67. >>>>>>> d0dc1f1 (Featire specs) =======
      68. >>>>>>> 752f0c0 (Featire specs) =======
      69. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      70. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      71. >>>>>>> 08edf50 (Featire specs) =======
      72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      73. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 5b7749a (Fix)
      74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      75. 1 let(:books) do
      76. 1 create(:book, title: titles.first)
      77. 1 create(:book, title: titles.second)
      78. end
      79. 2 let(:result) { titles.first }
      80. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      81. 1 include_examples 'sort test'
      82. end
      83. 1 context 'when sort by price High to Low' do
      84. 1 let(:books) do
      85. 1 create(:book, price_cents: 75)
      86. 1 create(:book, price_cents: 23)
      87. end
      88. 2 let(:result) { 75 }
      89. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      90. 1 include_examples 'sort test'
      91. end
      92. 1 context 'when sort price Low to High' do
      93. 1 let(:books) do
      94. 1 create(:book, price_cents: 75)
      95. 1 create(:book, price_cents: 23)
      96. end
      97. 2 let(:result) { 23 }
      98. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      99. 1 include_examples 'sort test'
      100. end
      101. 1 context 'when sort by Newest' do
      102. 1 let(:books) do
      103. 1 create(:book, created_at: books_dates.first)
      104. 1 create(:book, created_at: books_dates.second)
      105. end
      106. 2 let(:result) { books_dates.first }
      107. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      108. 1 include_examples 'sort test'
      109. end
      110. end
      111. <<<<<<< HEAD =======
      112. >>>>>>> d0dc1f1 (Featire specs) =======
      113. >>>>>>> 752f0c0 (Featire specs) =======
      114. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      115. >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      116. >>>>>>> 08edf50 (Featire specs) =======
      117. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      118. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) end

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= 36.84% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> 5b7749a (Fix) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true)
      1. 1 =======
      2. >>>>>>> d0dc1f1 (Featire specs) =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      6. >>>>>>> 7a02bbe (Featire specs) =======
      7. >>>>>>> 4552227 (Featire specs) =======
      8. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b7749a (Fix) RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      10. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      11. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      13. =======
      14. >>>>>>> bd8bda4 (Manifest_cache true) =======
      15. >>>>>>> 36356d3 (Featire specs) =======
      16. >>>>>>> 64dceec (Manifest_cache true) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
      17. <<<<<<< HEAD <<<<<<< HEAD
      18. =======
      19. >>>>>>> bd8bda4 (Manifest_cache true) =======
      20. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
      21. 2 let(:first_name) { FFaker::Name.first_name }
      22. 2 let(:last_name) { FFaker::Name.last_name }
      23. 2 let(:new_name) { FFaker::Name.first_name }
      24. 2 let(:old_name) { author.first_name }
      25. 4 let(:author) { create(:author) }
      26. 1 before do
      27. 4 sign_in(create(:admin_user), :admin_user)
      28. end
      29. 1 it 'can create an author' do
      30. 1 visit 'admin/authors'
      31. 1 click_link('New Author')
      32. 1 fill_in 'author[first_name]', with: first_name
      33. 1 fill_in 'author[last_name]', with: last_name
      34. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
      35. end
      36. 1 it 'can delete an author' do
      37. 1 author
      38. 1 visit 'admin/authors'
      39. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
      40. end
      41. 1 it 'can view an author' do
      42. 1 author
      43. 1 visit 'admin/authors'
      44. 1 click_link('View')
      45. 1 expect(page).to have_content(author.first_name)
      46. end
      47. 1 it 'can edit an author' do
      48. 1 author
      49. 1 visit 'admin/authors'
      50. 1 click_link('Edit')
      51. 1 fill_in 'author[first_name]', with: new_name
      52. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
      53. end
      54. end

      spec/feature/admin/book_spec.rb

      100.0% lines covered

      32 relevant lines. 32 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD ======= =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= =======
      7. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      8. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      9. >>>>>>> 4e81ea2 (Featire specs) =======
      10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      11. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      12. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      14. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      17. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) 5 <<<<<<< HEAD let(:book) { create(:book) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= let(:book) { create(:book) } ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) let(:category_one) { FactoryBot.create(:category) }
      18. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      19. 1 let(:params) do
      20. <<<<<<< HEAD
      21. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      22. 1 =======
      23. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      24. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      25. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      26. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      27. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      28. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      29. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
      30. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      31. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      32. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) { title: FFaker::Book.title,
      33. description: FFaker::Book.description,
      34. <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      35. dimensions: FFaker::Book.cover,
      36. year_of_publication: FFaker::Number.rand(1900..2022),
      37. materials: 'Soft cover',
      38. quantity: FFaker::Number.rand(2..5) }
      39. end
      40. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      41. 1 before do
      42. 4 sign_in(create(:admin_user), :admin_user)
      43. 4 book
      44. 4 visit 'admin/books'
      45. end
      46. 1 it 'can create an category' do
      47. 1 click_link('New Book')
      48. 1 fill_in 'book[title]', with: params[:title]
      49. 1 fill_in 'book[description]', with: params[:description]
      50. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
      51. 1 fill_in 'book[price_cents]', with: params[:price_cents]
      52. 1 fill_in 'book[materials]', with: params[:materials]
      53. 1 fill_in 'book[dimensions]', with: params[:dimensions]
      54. 1 fill_in 'book[quantity]', with: params[:quantity]
      55. 1 click_button('Create Book')
      56. 1 expect(page).to have_content(params[:title])
      57. end
      58. 1 it 'can delete an book' do
      59. 1 click_link('Delete')
      60. 1 expect(page).not_to have_content(book.title)
      61. end
      62. 1 it 'can view an book' do
      63. 1 click_link('View')
      64. 1 expect(page).to have_content(book.title)
      65. end
      66. 1 it 'can edit an book' do
      67. 1 click_link('Edit')
      68. 1 fill_in 'book[title]', with: 'New title'
      69. 1 click_button('Update Book')
      70. 1 expect(page).to have_content('New title')
      71. end
      72. end

      spec/feature/admin/category_spec.rb

      100.0% lines covered

      25 relevant lines. 25 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Category' do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:category_name) { FFaker::Book.genre }
      5. 5 let(:category) { create(:category) }
      6. 1 before do
      7. 4 sign_in(create(:admin_user), :admin_user)
      8. 4 category
      9. 4 visit 'admin/categories'
      10. <<<<<<< HEAD ======= =======
      11. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      12. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
      14. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      16. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      18. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      19. 7 >>>>>>> 7a02bbe (Featire specs) =======
      20. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. 7 >>>>>>> 7a02bbe (Featire specs) =======
      23. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      24. 1 <<<<<<< HEAD it 'can create an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      25. 1 <<<<<<< HEAD click_link('New Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      26. <<<<<<< HEAD
      27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      28. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      29. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      30. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      31. 1 visit "books/#{book.id}"
      32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      33. <<<<<<< HEAD
      34. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      35. =======
      36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      38. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      40. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      42. >>>>>>> 4e81ea2 (Featire specs) =======
      43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      47. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      54. <<<<<<< HEAD
      55. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      56. =======
      57. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      59. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      61. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      63. >>>>>>> 4e81ea2 (Featire specs) =======
      64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      66. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
      67. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      68. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= =======
      72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      73. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      74. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      75. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      76. >>>>>>> 7a02bbe (Featire specs) =======
      77. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      78. 1 click_button('Create Category') <<<<<<< HEAD ======= ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      79. 1 <<<<<<< HEAD expect(page).to have_content(category_name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      80. <<<<<<< HEAD
      81. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      82. =======
      83. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      84. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      85. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      86. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      87. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      88. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      89. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      90. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      91. 1 >>>>>>> 7a02bbe (Featire specs) =======
      92. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      93. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      94. 1 >>>>>>> 7a02bbe (Featire specs) =======
      95. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      96. 1 <<<<<<< HEAD it 'can delete an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      97. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      98. 1 click_link('Delete')
      99. <<<<<<< HEAD ======= =======
      100. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      101. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      102. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      103. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      104. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      105. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      106. >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      110. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      111. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      115. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      116. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      117. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      118. <<<<<<< HEAD
      119. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      120. =======
      121. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      122. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      123. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      125. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      126. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      127. >>>>>>> 4e81ea2 (Featire specs) =======
      128. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      129. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      130. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      131. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      132. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      133. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      134. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      135. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      136. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      138. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= expect(page).not_to have_content(category.name) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content('Catalog')
      139. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      140. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      141. <<<<<<< HEAD
      142. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      143. =======
      144. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      145. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      146. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      147. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      148. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      149. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      150. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      151. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      152. 1 >>>>>>> 7a02bbe (Featire specs) =======
      153. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      154. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      155. 1 >>>>>>> 7a02bbe (Featire specs) =======
      156. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      157. 1 <<<<<<< HEAD it 'can view an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      158. 1 <<<<<<< HEAD click_link('View') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      159. 1 <<<<<<< HEAD expect(page).to have_content(category.name) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      160. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      161. 1 <<<<<<< HEAD it 'can edit an category' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      162. 1 <<<<<<< HEAD click_link('Edit') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      163. 1 <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      164. 1 <<<<<<< HEAD click_button('Update Category') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      165. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      166. <<<<<<< HEAD
      167. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      168. 1 =======
      169. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      170. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      171. >>>>>>> 4e81ea2 (Featire specs) =======
      172. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      173. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      174. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      175. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD expect(page).to have_content('New Genre') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      176. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      177. >>>>>>> 7a02bbe (Featire specs) =======
      178. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      179. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      180. >>>>>>> 7a02bbe (Featire specs) =======
      181. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      182. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      183. end

      spec/feature/billing_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Billing', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      5. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 2 let(:user) { create(:user) }
      7. 1 let(:attributes_for) { attributes_for(:billing) }
      8. 1 describe '#fill_in', js: true do
      9. 1 it 'fill in billing' do
      10. 1 sign_in(user)
      11. 1 visit edit_user_path(user.id)
      12. 1 within('div#billing.col-md-5.mb-40') do
      13. 1 find_all('div', class: 'form-group')[0] do
      14. fill_in :first_name, with: attributes_for[:first_name]
      15. end
      16. 1 find_all('div', class: 'form-group')[1] do
      17. fill_in :last_name, with: attributes_for[:last_name]
      18. end
      19. 1 find_all('div', class: 'form-group')[2] do
      20. fill_in :address, with: attributes_for[:address]
      21. end
      22. 1 find_all('div', class: 'form-group')[3] do
      23. fill_in :city, with: attributes_for[:city]
      24. end
      25. 1 find_all('div', class: 'form-group')[4] do
      26. fill_in :zip, with: attributes_for[:zip]
      27. end
      28. 1 find_all('div', class: 'form-group')[5] do
      29. fill_in :country, with: attributes_for[:country]
      30. end
      31. 1 find_all('div', class: 'form-group')[6] do
      32. fill_in :phone, with: attributes_for[:phone]
      33. end
      34. 1 click_on I18n.t('settings.save')
      35. end
      36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      37. end
      38. end
      39. end

      spec/feature/book_spec.rb

      100.0% lines covered

      104 relevant lines. 104 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Book', type: :feature do
      2. 5 let(:category_one) { create(:category) }
      3. 3 let(:category_two) { create(:category) }
      4. 1 let(:params) do
      5. 4 { title: FFaker::Book.title,
      6. description: FFaker::Book.description,
      7. price_cents: FFaker::Number.rand(1..100),
      8. dimensions: FFaker::Book.cover,
      9. year_of_publication: FFaker::Number.rand(1900..2022),
      10. materials: 'Soft cover',
      11. quantity: FFaker::Number.rand(2..5) }
      12. end
      13. 7 let(:book) { create(:book).decorate }
      14. 1 describe '#show book' do
      15. 1 it 'show books info' do
      16. 1 visit "books/#{book.id}"
      17. 1 expect(page).to have_content(book.title)
      18. end
      19. 1 it 'clicked Beck to results' do
      20. 1 visit "books/#{book.id}"
      21. 1 find('a', class: 'general-back-link').click
      22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
      23. end
      24. 1 context 'when test read more' do
      25. 1 it 'show read more' do
      26. 1 visit "books/#{book.id}"
      27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
      28. end
      29. 1 it 'clicked read more', js: true do
      30. 1 visit "books/#{book.id}"
      31. 1 click_link 'Read More'
      32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
      33. end
      34. end
      35. <<<<<<< HEAD ======= =======
      36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      38. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      40. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      42. >>>>>>> 4e81ea2 (Featire specs) =======
      43. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      47. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      49. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 context 'when quantity changes', js: true do
      54. <<<<<<< HEAD
      55. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      56. =======
      57. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      59. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      60. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      61. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      63. >>>>>>> 4e81ea2 (Featire specs) =======
      64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      66. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      67. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      68. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      73. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      74. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 before do
      75. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      76. 2 visit "books/#{book.id}"
      77. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      78. 2 <<<<<<< HEAD find('a', class: 'inc').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      79. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      80. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      81. <<<<<<< HEAD
      82. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      83. 1 =======
      84. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      85. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      86. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      87. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      88. 2 >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) find('a', class: 'inc').click
      89. end
      90. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      91. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
      92. end
      93. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) it 'increase quantity' do >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      94. 2 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD find('a', class: 'inc').click
      95. end
      96. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
      97. 2 find('a', class: 'inc').click
      98. end
      99. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) it 'increase quantity' do >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) it 'increase quantity' do >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD it 'increase quantity' do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      100. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs)
      101. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
      102. ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs)
      103. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) =======
      104. ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      105. ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price)
      106. ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      107. ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      110. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= =======
      111. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= =======
      112. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= =======
      113. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
      115. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      116. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      117. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      118. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
      119. <<<<<<< HEAD ======= =======
      120. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      121. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      122. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      123. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      125. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      126. >>>>>>> 4e81ea2 (Featire specs) =======
      127. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      128. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      129. <<<<<<< HEAD
      130. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      131. =======
      132. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      133. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      134. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      135. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      136. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      137. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      138. >>>>>>> 4e81ea2 (Featire specs) =======
      139. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      140. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      141. <<<<<<< HEAD
      142. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      143. =======
      144. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      145. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      146. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      147. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      148. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      149. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      150. >>>>>>> 4e81ea2 (Featire specs) =======
      151. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      152. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) it 'decrease quantity' do >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) it 'decrease quantity' do >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      153. <<<<<<< HEAD
      154. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      155. =======
      156. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      157. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      158. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      159. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      160. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      161. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      162. >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      164. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD find('a', class: 'dec').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= find('a', class: 'dec').click ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= find('a', class: 'dec').click ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content("€#{book.price * 2}")
      165. end
      166. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      167. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD <<<<<<< HEAD ======= it 'decrease quantity', js: true do >>>>>>> 0d6dd12 (Manifest_cache true) ======= it 'decrease quantity', js: true do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) it 'decrease quantity', js: true do <<<<<<< HEAD ======= it 'decrease quantity', js: true do >>>>>>> 0d6dd12 (Manifest_cache true) ======= it 'decrease quantity', js: true do >>>>>>> e3e66f3 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= it 'decrease quantity', js: true do >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= it 'decrease quantity', js: true do >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      168. 1 find('a', class: 'dec').click
      169. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content("€#{book.price}")
      170. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      171. end
      172. end
      173. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      174. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      175. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      176. end
      177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      178. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      179. 1 describe '#catalog' do
      180. 1 describe 'filter by category' do
      181. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      182. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) describe '#catalog' do
      183. 1 describe 'filter by category' do
      184. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) before do
      185. <<<<<<< HEAD
      186. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      187. =======
      188. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      189. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      191. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      193. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      194. >>>>>>> 4e81ea2 (Featire specs) =======
      195. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      197. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      198. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      199. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      200. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      201. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      202. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      203. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      204. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      205. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 category_one.books.create(params)
      206. <<<<<<< HEAD
      207. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      208. =======
      209. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      210. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      211. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      212. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      213. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      214. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      215. >>>>>>> 4e81ea2 (Featire specs) =======
      216. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      217. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      218. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      219. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      220. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      221. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      222. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      223. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      224. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      225. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      226. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 visit books_path
      227. <<<<<<< HEAD
      228. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      229. =======
      230. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      231. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      232. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      233. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      234. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      235. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      236. >>>>>>> 4e81ea2 (Featire specs) =======
      237. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      238. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      239. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      240. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      241. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      242. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      243. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      244. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      246. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      248. <<<<<<< HEAD
      249. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      250. =======
      251. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      252. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      253. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      254. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      255. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      256. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      257. >>>>>>> 4e81ea2 (Featire specs) =======
      258. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      259. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      260. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      261. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      262. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      263. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      264. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      265. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      266. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      267. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      268. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      269. <<<<<<< HEAD
      270. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      271. =======
      272. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      273. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      274. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      275. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      276. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      277. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      278. >>>>>>> 4e81ea2 (Featire specs) =======
      279. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      280. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      281. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      282. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      283. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      284. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      285. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      286. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      287. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      288. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      289. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 after do
      290. <<<<<<< HEAD
      291. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      292. =======
      293. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      294. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      295. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      296. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      297. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      298. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      299. >>>>>>> 4e81ea2 (Featire specs) =======
      300. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      301. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      302. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      303. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      304. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      305. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      306. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      307. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      309. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      310. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 category_one.destroy
      311. <<<<<<< HEAD
      312. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      313. =======
      314. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      315. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      316. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      317. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      318. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      319. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      320. >>>>>>> 4e81ea2 (Featire specs) =======
      321. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      322. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      323. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      324. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      325. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      326. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      327. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      328. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      329. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      330. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      331. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      332. <<<<<<< HEAD
      333. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      334. =======
      335. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      336. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      337. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      338. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      339. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      340. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      341. >>>>>>> 4e81ea2 (Featire specs) =======
      342. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      344. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      345. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      346. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      347. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      348. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      349. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      350. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      351. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      352. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      353. <<<<<<< HEAD
      354. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      355. =======
      356. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      357. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      358. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      359. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      360. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      361. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      362. >>>>>>> 4e81ea2 (Featire specs) =======
      363. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      364. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      365. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      366. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      367. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      368. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      369. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      370. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      371. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      372. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      373. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 it 'show book count for category' do
      374. <<<<<<< HEAD
      375. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      376. =======
      377. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      378. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      379. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      380. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      381. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      382. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      383. >>>>>>> 4e81ea2 (Featire specs) =======
      384. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      385. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      386. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      387. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      388. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      389. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      390. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      391. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      392. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      393. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      394. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 expect(page).to have_content(category_one.books.size)
      395. <<<<<<< HEAD
      396. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      397. =======
      398. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      399. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      400. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      401. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      402. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      403. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      404. >>>>>>> 4e81ea2 (Featire specs) =======
      405. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      406. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      407. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      408. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      409. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      410. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      411. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      412. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      413. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      414. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      415. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      416. <<<<<<< HEAD
      417. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      418. =======
      419. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      420. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      421. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      422. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      424. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      425. >>>>>>> 4e81ea2 (Featire specs) =======
      426. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      427. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      428. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      429. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      430. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      431. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      432. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      433. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      434. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      435. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      436. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      437. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      438. 1 it 'filter book by category' do
      439. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      440. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      441. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'filter book by category' do
      442. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
      443. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_on category_one.name
      444. <<<<<<< HEAD
      445. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      446. =======
      447. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      448. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      449. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      450. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      451. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      452. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      453. >>>>>>> 4e81ea2 (Featire specs) =======
      454. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      455. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      456. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      457. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      458. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      460. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      461. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      462. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      463. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      464. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      465. <<<<<<< HEAD
      466. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      467. =======
      468. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      469. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      470. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      471. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      472. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      473. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      474. >>>>>>> 4e81ea2 (Featire specs) =======
      475. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      476. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      477. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      478. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      479. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      480. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      481. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      482. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      483. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      484. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      485. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      486. <<<<<<< HEAD
      487. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      488. =======
      489. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      490. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      491. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      492. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      493. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      494. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      495. >>>>>>> 4e81ea2 (Featire specs) =======
      496. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      497. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      498. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      499. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      500. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      501. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      502. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      503. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      504. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      505. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      506. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
      507. <<<<<<< HEAD
      508. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      509. =======
      510. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      511. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      512. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      513. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      514. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      515. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      516. >>>>>>> 4e81ea2 (Featire specs) =======
      517. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      518. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      519. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      520. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      521. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      522. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      523. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      524. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      525. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      526. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      527. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      528. <<<<<<< HEAD
      529. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      530. =======
      531. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      532. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      533. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      534. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      535. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      536. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      537. >>>>>>> 4e81ea2 (Featire specs) =======
      538. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      539. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      540. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      541. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      542. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      543. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      544. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      545. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      546. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      547. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      548. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      549. <<<<<<< HEAD
      550. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      551. =======
      552. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      553. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      554. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      555. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      556. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      557. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      558. >>>>>>> 4e81ea2 (Featire specs) =======
      559. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      560. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      561. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      562. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      563. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      564. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      565. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      566. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      567. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      568. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      569. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      570. <<<<<<< HEAD
      571. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      572. =======
      573. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      574. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      575. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      576. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      577. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      578. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      579. >>>>>>> 4e81ea2 (Featire specs) =======
      580. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      581. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      582. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      583. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      584. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      585. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      586. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      587. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      588. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      589. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      590. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 describe 'filter by all books' do
      591. <<<<<<< HEAD
      592. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      593. =======
      594. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      595. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      596. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      597. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      598. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      599. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      600. >>>>>>> 4e81ea2 (Featire specs) =======
      601. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      602. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      603. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      604. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      605. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      606. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      607. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      608. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      609. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      610. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      611. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 before do
      612. <<<<<<< HEAD
      613. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      614. =======
      615. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      616. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      617. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      618. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      619. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      620. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      621. >>>>>>> 4e81ea2 (Featire specs) =======
      622. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      623. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      624. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      625. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      626. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      627. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      628. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      629. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      630. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      631. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      632. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 category_one.books.create(params)
      633. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      634. 2 category_two.books.create(params)
      635. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      636. 2 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      637. 2 <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      638. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      639. 2 click_on 'All'
      640. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      641. <<<<<<< HEAD
      642. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      643. =======
      644. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      645. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      646. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      647. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      648. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      649. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      650. >>>>>>> 4e81ea2 (Featire specs) =======
      651. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      652. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      653. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      654. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      656. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      657. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      658. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      659. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      660. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      661. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      662. <<<<<<< HEAD
      663. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      664. =======
      665. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      666. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      667. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      668. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      669. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      670. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      671. >>>>>>> 4e81ea2 (Featire specs) =======
      672. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      673. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      674. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      675. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      676. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      677. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      678. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      679. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      680. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      681. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      682. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 after do
      683. <<<<<<< HEAD
      684. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      685. =======
      686. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      687. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      688. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      689. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      690. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      691. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      692. >>>>>>> 4e81ea2 (Featire specs) =======
      693. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      694. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      695. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      696. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      697. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      698. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      699. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      700. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      701. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      703. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 category_one.destroy
      704. <<<<<<< HEAD
      705. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      706. =======
      707. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      708. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      709. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      710. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      711. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      712. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      713. >>>>>>> 4e81ea2 (Featire specs) =======
      714. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      715. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      716. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      717. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      718. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      719. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      720. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      721. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      722. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      723. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      724. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 category_two.destroy
      725. <<<<<<< HEAD
      726. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      727. =======
      728. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      729. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      730. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      731. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      732. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      733. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      734. >>>>>>> 4e81ea2 (Featire specs) =======
      735. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      736. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      737. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      738. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      739. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      740. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      741. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      742. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      743. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      744. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      745. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      746. <<<<<<< HEAD
      747. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      748. =======
      749. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      750. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      751. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      752. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      753. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      754. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      755. >>>>>>> 4e81ea2 (Featire specs) =======
      756. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      757. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      758. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      759. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      760. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      761. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      762. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      763. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      765. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      767. <<<<<<< HEAD
      768. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      769. =======
      770. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      771. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      772. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      773. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      774. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      775. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      776. >>>>>>> 4e81ea2 (Featire specs) =======
      777. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      778. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      779. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      780. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      781. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      782. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      783. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      784. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      785. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      786. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      787. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 it 'shown books for first category' do
      788. <<<<<<< HEAD
      789. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      790. =======
      791. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      792. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      793. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      794. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      795. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      796. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      797. >>>>>>> 4e81ea2 (Featire specs) =======
      798. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      799. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      800. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      801. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      802. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      803. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      804. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      805. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      806. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      807. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      808. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 expect(page).to have_content(category_one.books.first.title)
      809. <<<<<<< HEAD
      810. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      811. =======
      812. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      813. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      814. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      815. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      816. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      817. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      818. >>>>>>> 4e81ea2 (Featire specs) =======
      819. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      820. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      821. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      822. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      823. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      824. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      825. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      826. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      827. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      828. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      829. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      830. <<<<<<< HEAD
      831. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      832. =======
      833. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      834. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      835. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      836. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      837. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      838. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      839. >>>>>>> 4e81ea2 (Featire specs) =======
      840. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      841. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      842. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      843. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      844. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      845. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      846. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      847. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      848. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      849. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      850. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      851. <<<<<<< HEAD
      852. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      853. =======
      854. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      855. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      856. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      857. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      858. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      859. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      860. >>>>>>> 4e81ea2 (Featire specs) =======
      861. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      862. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      863. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      864. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      865. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      866. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      867. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      868. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      869. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      870. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      871. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 it 'shown books for second category' do
      872. <<<<<<< HEAD
      873. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      874. =======
      875. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      876. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      877. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      878. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      879. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      880. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      881. >>>>>>> 4e81ea2 (Featire specs) =======
      882. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      883. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      884. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      885. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      886. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      887. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      888. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      889. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      890. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      891. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      892. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 expect(page).to have_content(category_two.books.first.title)
      893. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      894. end
      895. end
      896. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      897. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      898. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      899. end
      900. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      901. <<<<<<< HEAD
      902. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      903. =======
      904. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      905. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      906. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      907. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      908. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      909. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      910. >>>>>>> 4e81ea2 (Featire specs) =======
      911. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      912. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      913. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      914. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      915. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      916. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      917. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      918. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      919. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      920. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      921. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 describe 'load_more' do
      922. <<<<<<< HEAD
      923. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      924. =======
      925. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      926. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      927. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      928. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      929. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      930. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      931. >>>>>>> 4e81ea2 (Featire specs) =======
      932. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      933. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      934. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      935. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      936. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      937. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      938. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      939. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      940. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      941. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      942. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 before do
      943. <<<<<<< HEAD
      944. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      945. =======
      946. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      947. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      948. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      949. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      950. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      951. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      952. >>>>>>> 4e81ea2 (Featire specs) =======
      953. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      954. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      955. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      956. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      957. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      958. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      959. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      960. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      961. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      962. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      963. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 3 <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= <<<<<<< HEAD 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      964. <<<<<<< HEAD
      965. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      966. =======
      967. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      968. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      969. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      970. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      971. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      972. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      973. >>>>>>> 4e81ea2 (Featire specs) =======
      974. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      975. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      976. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      977. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      978. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      979. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      980. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      981. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      982. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      983. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      984. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 72 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) books << create(:book)
      985. end
      986. end <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      987. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      988. <<<<<<< HEAD
      989. 4 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      990. 4 =======
      991. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      992. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      993. >>>>>>> 4e81ea2 (Featire specs) =======
      994. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      995. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      996. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      997. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD let(:books) { [] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      998. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      999. >>>>>>> 7a02bbe (Featire specs) =======
      1000. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1001. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1002. >>>>>>> 7a02bbe (Featire specs) =======
      1003. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1004. <<<<<<< HEAD
      1005. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1006. 1 =======
      1007. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      1008. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      1009. 4 >>>>>>> 4e81ea2 (Featire specs) =======
      1010. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1011. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1012. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1013. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD it 'show books without view more button' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1014. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1015. 4 >>>>>>> 7a02bbe (Featire specs) =======
      1016. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1017. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1018. 4 >>>>>>> 7a02bbe (Featire specs) =======
      1019. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1020. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1021. 1 visit books_path
      1022. <<<<<<< HEAD ======= =======
      1023. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1024. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1025. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1026. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1027. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1028. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1029. >>>>>>> 4e81ea2 (Featire specs) =======
      1030. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1031. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1032. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1033. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1034. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1035. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1036. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1037. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1038. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1039. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1040. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1041. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1042. 1 it 'show books without view more button' do
      1043. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1044. 1 <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1045. 1 <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1046. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1047. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
      1048. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      1049. <<<<<<< HEAD
      1050. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1051. =======
      1052. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1053. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1054. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1055. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1056. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1057. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1058. >>>>>>> 4e81ea2 (Featire specs) =======
      1059. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1060. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1061. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1062. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1063. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1064. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1065. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1066. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1067. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1068. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1069. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1070. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1071. 1 context 'when view more' do
      1072. 1 it 'show books with view more button' do
      1073. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1074. 1 <<<<<<< HEAD visit books_path ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1075. <<<<<<< HEAD
      1076. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1077. =======
      1078. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      1079. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      1080. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1081. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1082. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1083. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1084. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1085. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1086. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1087. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1088. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1089. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1090. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1091. 1 <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1092. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1093. 1 expect(page).to have_css('a', class: 'view_more')
      1094. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      1095. <<<<<<< HEAD
      1096. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1097. =======
      1098. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1099. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1100. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1101. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1102. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1103. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1104. >>>>>>> 4e81ea2 (Featire specs) =======
      1105. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1106. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1107. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1108. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1109. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1111. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1112. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1113. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1115. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1116. <<<<<<< HEAD
      1117. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1118. =======
      1119. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1120. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1121. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1122. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1123. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1124. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1125. >>>>>>> 4e81ea2 (Featire specs) =======
      1126. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1131. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1132. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1133. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1135. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 it 'show loaded books', js: true do
      1137. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1138. 1 visit books_path
      1139. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1140. 1 <<<<<<< HEAD find('a', class: 'view_more').click ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1141. 1 <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1142. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1143. <<<<<<< HEAD
      1144. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1145. =======
      1146. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      1147. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      1148. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1149. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      1150. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      1151. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1152. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1153. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1154. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1155. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1156. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1157. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1158. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1159. <<<<<<< HEAD end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1160. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      1161. end
      1162. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1163. <<<<<<< HEAD
      1164. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1165. =======
      1166. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1167. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1168. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1169. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1170. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1171. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1172. >>>>>>> 4e81ea2 (Featire specs) =======
      1173. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1174. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1175. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1176. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1177. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1178. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1179. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1180. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1182. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 describe 'sort' do
      1184. <<<<<<< HEAD
      1185. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1186. =======
      1187. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1188. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1189. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1190. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1191. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1192. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1193. >>>>>>> 4e81ea2 (Featire specs) =======
      1194. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1195. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1196. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1197. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1198. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1199. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1200. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1201. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1203. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1204. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 shared_examples 'sort test' do
      1205. <<<<<<< HEAD
      1206. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1207. =======
      1208. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1209. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1210. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1211. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1212. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1213. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1214. >>>>>>> 4e81ea2 (Featire specs) =======
      1215. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1216. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1217. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1218. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1219. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1220. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1221. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1222. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1223. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1224. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1225. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 5 it 'sort books' do
      1226. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1227. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
      1228. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
      1229. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1230. 5 <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1231. <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 379a979 (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 34509eee (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1232. <<<<<<< HEAD
      1233. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      1234. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1235. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= =======
      1236. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1237. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
      1238. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1239. <<<<<<< HEAD
      1240. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1241. =======
      1242. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1243. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1244. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1245. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1246. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1247. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1248. >>>>>>> 4e81ea2 (Featire specs) =======
      1249. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1250. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1251. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1252. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1253. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1254. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1255. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1256. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1257. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1258. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1259. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 5 visit books_path
      1260. <<<<<<< HEAD
      1261. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1262. =======
      1263. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1264. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1265. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1266. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1267. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1268. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1269. >>>>>>> 4e81ea2 (Featire specs) =======
      1270. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1271. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1272. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1273. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1274. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1275. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1276. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1277. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1278. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1280. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1281. <<<<<<< HEAD
      1282. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1283. =======
      1284. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) =======
      1285. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= =======
      1286. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1287. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= =======
      1288. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1289. >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1290. >>>>>>> 4e81ea2 (Featire specs) =======
      1291. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1292. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1293. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      1294. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      1295. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
      1296. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      1297. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      1298. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      1299. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      1300. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      1301. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
      1302. id: 'menu').click <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1303. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
      1304. 5 click_link button
      1305. end
      1306. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
      1307. end
      1308. end
      1309. 1 context 'when sort by title A to Z' do
      1310. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1311. 2 let(:book_title) { 'Anna' }
      1312. 1 include_examples 'sort test'
      1313. end
      1314. 1 context 'when sort by title Z to A' do
      1315. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1316. 2 let(:book_title) { 'Zimbabwe' }
      1317. 1 include_examples 'sort test'
      1318. end
      1319. 1 context 'when sort by price High to Low' do
      1320. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1321. 2 let(:book_title) { 'Zimbabwe' }
      1322. 1 include_examples 'sort test'
      1323. end
      1324. 1 context 'when sort by price Low to High' do
      1325. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1326. 2 let(:book_title) { 'Anna' }
      1327. 1 include_examples 'sort test'
      1328. end
      1329. 1 context 'when sort by newest' do
      1330. 2 <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1331. 2 let(:book_title) { 'Zimbabwe' }
      1332. 1 include_examples 'sort test'
      1333. end
      1334. end
      1335. end

      spec/feature/home_spec.rb

      100.0% lines covered

      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 49 relevant lines. 49 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Home', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 1 describe 'Get Started' do
      5. 1 it 'on click move to catalog page' do
      6. 1 visit root_path
      7. 1 click_on 'Get Started'
      8. 1 expect(page).to have_content('Catalog')
      9. end
      10. end
      11. 1 describe 'navbar' do
      12. 2 let(:books_category) { create(:books_category) }
      13. 1 it 'on click home move to root-path' do
      14. 1 visit books_path
      15. 1 find('a', id: 'root').click
      16. 1 expect(page).to have_content('Get Started')
      17. end
      18. 1 it 'on click category name move to root-path with books that belong to this category' do
      19. 1 books_category
      20. 1 visit root_path
      21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      22. 1 within('ul', id: 'nav') do
      23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      24. end
      25. 1 expect(page).to have_content(books_category.category.books.first.title)
      26. end
      27. 1 context 'when guest' do
      28. 1 it 'on click login go to login page' do
      29. 1 visit root_path
      30. 1 within 'div', class: 'visible-xs' do
      31. 1 click_link I18n.t('header.log_in')
      32. end
      33. 1 expect(page).to have_content(I18n.t('header.log_in'))
      34. end
      35. 1 it 'on click sing up go to sing up page' do
      36. 1 visit root_path
      37. 1 within 'div', class: 'visible-xs' do
      38. 1 click_link I18n.t('header.sing_up')
      39. end
      40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
      41. end
      42. end
      43. 1 context 'when user', js: true do
      44. 4 let(:user) { create(:user) }
      45. 1 before do
      46. 3 sign_in(user)
      47. end
      48. 1 it 'on click account show settings' do
      49. 1 visit root_path
      50. 1 click_on I18n.t('header.account')
      51. 1 expect(page).to have_content(I18n.t('header.settings'))
      52. end
      53. 1 it 'on click account show log_out' do
      54. 1 visit root_path
      55. 1 click_on I18n.t('header.account')
      56. 1 expect(page).to have_content(I18n.t('header.log_out'))
      57. end
      58. 1 it 'log_out' do
      59. 1 visit root_path
      60. 1 click_on I18n.t('header.account')
      61. 1 click_on(I18n.t('header.log_out'), match: :first)
      62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
      63. end
      64. end
      65. end
      66. end

      spec/feature/login_spec.rb

      100.0% lines covered

      19 relevant lines. 19 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Login', type: :feature do
      2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#login' do
      4. 1 before do
      5. 2 visit new_user_session_path
      6. end
      7. 1 context 'when successfully login' do
      8. 1 it 'login' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: user_second.email
      11. 1 fill_in 'user_password', with: user_second.password
      12. 1 click_on I18n.t('header.log_in')
      13. end
      14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      15. end
      16. end
      17. 1 context 'when unsuccessfully login' do
      18. 1 it 'didn`t login' do
      19. 1 within 'form', class: 'new_user', id: 'new_user' do
      20. 1 fill_in 'user_email', with: user_second.email
      21. 1 fill_in 'user_password', with: 'wrong_password'
      22. 1 click_on I18n.t('header.log_in')
      23. end
      24. 1 expect(page).to have_text 'Invalid Email or password.'
      25. end
      26. end
      27. end
      28. end

      spec/feature/new_password_spec.rb

      100.0% lines covered

      13 relevant lines. 13 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'New Password', type: :feature do
      4. 3 let(:user) { FactoryBot.create(:user) }
      5. 1 describe '#new_password' do
      6. 1 it 'change password' do
      7. 1 user.reset_password('newPassword', 'newPassword')
      8. 1 expect(user.password).to eq('newPassword')
      9. end
      10. 1 it 'not validate password' do
      11. 1 visit new_user_password_path
      12. 1 fill_in 'email', with: user.email
      13. 1 click_on I18n.t('login.send_instructions')
      14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
      15. end
      16. end
      17. end

      spec/feature/registration_spec.rb

      100.0% lines covered

      29 relevant lines. 29 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Registration', type: :feature do
      2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
      3. 1 describe '#sing_up' do
      4. 1 before do
      5. 3 visit new_user_registration_path
      6. end
      7. 1 context 'when successfully sing_up' do
      8. 1 it 'sing_up users' do
      9. 1 within 'form', class: 'new_user', id: 'new_user' do
      10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
      11. 1 fill_in 'user_password', with: user.password
      12. 1 fill_in 'user_password_confirmation', with: user.password
      13. 1 click_on I18n.t('header.sing_up')
      14. end
      15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      16. end
      17. end
      18. 1 context 'when users is already exits' do
      19. 1 it 'sing_up users' do
      20. 1 within 'form', class: 'new_user', id: 'new_user' do
      21. 1 fill_in 'user_email', with: user.email
      22. 1 fill_in 'user_password', with: user.password
      23. 1 fill_in 'user_password_confirmation', with: user.password
      24. 1 click_on I18n.t('header.sing_up')
      25. end
      26. 1 expect(page).to have_text('Email has already been taken')
      27. end
      28. end
      29. 1 context 'when unsuccessfully sing_up' do
      30. 1 it 'didn`t sing_up' do
      31. 1 within 'form', class: 'new_user', id: 'new_user' do
      32. 1 fill_in 'user_email', with: FFaker::Internet.email
      33. 1 fill_in 'user_password', with: 'password'
      34. 1 fill_in 'user_password_confirmation', with: 'wrong'
      35. 1 click_on I18n.t('header.sing_up')
      36. end
      37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      38. end
      39. end
      40. end
      41. end

      spec/feature/review_spec.rb

      100.0% lines covered

      30 relevant lines. 30 lines covered and 0 lines missed.
          
      1. 1 require_relative '../rails_helper'
      2. 1 require_relative '../support/shared_context'
      3. 1 RSpec.describe 'Review', type: :feature do
      4. 1 include_context 'with api request authentication helper methods'
      5. 1 include_context 'with api request global before and after hooks'
      6. 3 let(:user) { FactoryBot.create(:user).decorate }
      7. 3 let(:book) { FactoryBot.create(:book).decorate }
      8. 1 before do
      9. 2 sign_in(user)
      10. 2 visit book_path(book)
      11. end
      12. 1 shared_examples 'review' do
      13. 2 it 'review' do
      14. 2 find('i', id: rating).click
      15. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
      16. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
      17. 2 click_on I18n.t('review.post')
      18. 2 expect(page).to have_content(result)
      19. end
      20. end
      21. 1 describe '#post review', js: true do
      22. 1 context 'when review posted' do
      23. 2 let(:rating) { "star#{rand(1..5)}" }
      24. 2 let(:title_words) { 5 }
      25. 2 let(:body_words) { 10 }
      26. 2 let(:result) { user.name_or_email }
      27. 1 include_examples 'review'
      28. end
      29. 1 context 'when review not been posted' do
      30. 2 let(:rating) { "star#{rand(1..5)}" }
      31. 2 let(:title_words) { 80 }
      32. 2 let(:body_words) { 30 }
      33. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
      34. 1 include_examples 'review'
      35. end
      36. end
      37. end

      spec/feature/settings_spec.rb

      100.0% lines covered

      34 relevant lines. 34 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'Settings', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 4 let(:user) { create(:user) }
      5. 1 before do
      6. 3 sign_in(user)
      7. 3 visit edit_user_path(user.id)
      8. 3 click_link I18n.t('settings.privacy')
      9. end
      10. 1 describe '#email_change' do
      11. 1 it 'change email' do
      12. 1 within('div', id: 'email') do
      13. 1 fill_in :email, with: FFaker::Internet.email
      14. 1 click_on I18n.t('settings.save')
      15. end
      16. 1 user.confirm
      17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      18. end
      19. end
      20. 1 describe '#password_change' do
      21. 1 context 'when error' do
      22. 1 it 'didnt change password' do
      23. 1 within('div', id: 'password') do
      24. 1 fill_in :current_password, with: user.password
      25. 1 fill_in :password, with: 'newPassword'
      26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
      27. 1 click_on I18n.t('settings.save')
      28. end
      29. 1 user.confirm
      30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
      31. end
      32. end
      33. 1 context 'when successful' do
      34. 1 it 'didnt change password' do
      35. 1 within('div', id: 'password') do
      36. 1 fill_in :current_password, with: user.password
      37. 1 fill_in :password, with: 'newPassword'
      38. 1 fill_in :password_confirmation, with: 'newPassword'
      39. 1 click_on I18n.t('settings.save')
      40. end
      41. 1 user.confirm
      42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
      43. end
      44. end
      45. end
      46. end

      spec/feature/shipping_spec.rb

      73.08% lines covered

      26 relevant lines. 19 lines covered and 7 lines missed.
          
      1. 1 RSpec.describe 'Shipping', type: :feature do
      2. 1 include_context 'with api request authentication helper methods'
      3. 1 include_context 'with api request global before and after hooks'
      4. 2 let(:user) { FactoryBot.create(:user) }
      5. 1 let(:attributes_for) { attributes_for(:shipping) }
      6. 1 describe '#fill_in', js: true do
      7. 1 it 'fill in shipping' do
      8. 1 sign_in(user)
      9. 1 visit edit_user_path(user.id)
      10. 1 within('div#shipping.col-md-5.mb-40') do
      11. 1 find_all('div', class: 'form-group')[0] do
      12. fill_in :first_name, with: attributes_for[:first_name]
      13. end
      14. 1 find_all('div', class: 'form-group')[1] do
      15. fill_in :last_name, with: attributes_for[:last_name]
      16. end
      17. 1 find_all('div', class: 'form-group')[2] do
      18. fill_in :address, with: attributes_for[:address]
      19. end
      20. 1 find_all('div', class: 'form-group')[3] do
      21. fill_in :city, with: attributes_for[:city]
      22. end
      23. 1 find_all('div', class: 'form-group')[4] do
      24. fill_in :zip, with: attributes_for[:zip]
      25. end
      26. 1 find_all('div', class: 'form-group')[5] do
      27. fill_in :country, with: attributes_for[:country]
      28. end
      29. 1 find_all('div', class: 'form-group')[6] do
      30. fill_in :phone, with: attributes_for[:phone]
      31. end
      32. 1 click_on I18n.t('settings.save')
      33. end
      34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
      35. end
      36. end
      37. end

      spec/feature/user_spec.rb

      100.0% lines covered

      42 relevant lines. 42 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe 'User', type: :feature do
      2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
      3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
      4. 1 describe '#sing_up' do
      5. 1 context 'when successfully sing_up' do
      6. 1 before do
      7. 1 visit new_user_registration_path
      8. 1 within 'form', class: 'new_user', id: 'new_user' do
      9. 1 fill_in 'user_email', with: user.email
      10. 1 fill_in 'user_password', with: user.password
      11. 1 fill_in 'user_password_confirmation', with: user.password
      12. 1 click_on I18n.t('header.sing_up')
      13. end
      14. end
      15. 1 it 'sing_up user' do
      16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
      17. end
      18. end
      19. 1 context 'when unsuccessfully sing_up' do
      20. 1 it 'didn`t sing_up' do
      21. 1 visit new_user_registration_path
      22. 1 within 'form', class: 'new_user', id: 'new_user' do
      23. 1 fill_in 'user_email', with: FFaker::Internet.email
      24. 1 fill_in 'user_password', with: 'wrong'
      25. 1 fill_in 'user_password_confirmation', with: 'wrong'
      26. 1 click_on I18n.t('header.sing_up')
      27. end
      28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
      29. end
      30. end
      31. end
      32. 1 describe '#login' do
      33. 1 before do
      34. 2 user_second.confirm
      35. end
      36. 1 context 'when successfully login' do
      37. 1 it 'login' do
      38. 1 visit new_user_session_path
      39. 1 within 'form', class: 'new_user', id: 'new_user' do
      40. 1 fill_in 'user_email', with: user_second.email
      41. 1 fill_in 'user_password', with: user_second.password
      42. 1 click_on I18n.t('header.log_in')
      43. end
      44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
      45. end
      46. end
      47. 1 context 'when unsuccessfully login' do
      48. 1 it 'didn`t login' do
      49. 1 visit new_user_session_path
      50. 1 within 'form', class: 'new_user', id: 'new_user' do
      51. 1 fill_in 'user_email', with: user_second.email
      52. 1 fill_in 'user_password', with: 'wrong_password'
      53. 1 click_on I18n.t('header.log_in')
      54. end
      55. 1 expect(page).to have_text 'Invalid Email or password.'
      56. end
      57. end
      58. end
      59. end

      spec/models/admin_user_spec.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and <<<<<<< HEAD ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      3. 1 <<<<<<< HEAD context 'when validations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'Get Started' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      4. <<<<<<< HEAD
      5. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 2 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 7a02bbe (Featire specs) =======
      18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      19. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      21. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. 1 >>>>>>> 7a02bbe (Featire specs) =======
      23. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      24. <<<<<<< HEAD
      25. 2 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      26. 2 =======
      27. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      28. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      29. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      30. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      31. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      32. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      33. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      34. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      35. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      36. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. 1 >>>>>>> 7a02bbe (Featire specs) =======
      38. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      39. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      41. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      42. 1 >>>>>>> 7a02bbe (Featire specs) =======
      43. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) visit root_path >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) visit root_path >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= visit root_path <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      44. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      45. 1 click_on 'Get Started'
      46. 1 expect(page).to have_content('Catalog')
      47. end
      48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      49. <<<<<<< HEAD
      50. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      51. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      52. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      53. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      54. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      55. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      56. 1 describe 'navbar' do
      57. 2 let(:books_category) { FactoryBot.create(:books_category) }
      58. 1 it 'on click home move to root-path' do
      59. 1 visit books_path
      60. 1 find('a', id: 'root').click
      61. 1 expect(page).to have_content('Get Started')
      62. end
      63. 1 it 'on click category name move to root-path with books that belong to this category' do
      64. 1 books_category
      65. 1 visit root_path
      66. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
      67. 1 within('ul', id: 'nav') do
      68. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
      69. end
      70. 1 expect(page).to have_content(books_category.category.books.first.title)
      71. end
      72. end
      73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

      spec/models/author_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe Author, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:first_name) }
      6. 2 it { is_expected.to validate_presence_of(:last_name) }
      7. end
      8. <<<<<<< HEAD ======= =======
      9. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      10. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      11. >>>>>>> 4e81ea2 (Featire specs) =======
      12. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      14. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      17. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      22. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      23. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      24. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      25. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      26. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      27. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      29. <<<<<<< HEAD
      30. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      31. =======
      32. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      33. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      34. >>>>>>> 4e81ea2 (Featire specs) =======
      35. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      40. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      41. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      44. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      47. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      50. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD context 'when associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      52. <<<<<<< HEAD
      53. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      54. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      55. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      56. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      57. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      58. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      59. 1 describe 'author' do
      60. 1 context 'when validations' do
      61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      62. <<<<<<< HEAD
      63. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      64. =======
      65. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      66. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      67. >>>>>>> 4e81ea2 (Featire specs) =======
      68. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      70. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      72. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      73. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      74. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      75. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      76. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      77. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      79. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      80. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      81. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      82. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      83. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      84. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      85. <<<<<<< HEAD
      86. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      87. =======
      88. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      89. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      90. >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      92. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      93. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      94. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      95. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      96. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      97. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      99. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      100. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      102. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      103. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      104. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      106. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      107. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      108. <<<<<<< HEAD
      109. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      110. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      111. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      112. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      113. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      114. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      115. 1 context 'when associations' do
      116. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      117. 2 it { is_expected.to have_many(:books).through(:authors_books) }
      118. end
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      120. <<<<<<< HEAD
      121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      122. =======
      123. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      124. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      125. >>>>>>> 4e81ea2 (Featire specs) =======
      126. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      131. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      132. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      133. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      134. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      135. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      136. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      138. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      139. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      140. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      141. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      142. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

      spec/models/authors_book_spec.rb

      100.0% lines covered

      <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) require 'rails_helper'
      2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe AuthorsBook, type: :model do
      3. <<<<<<< HEAD
      4. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      5. =======
      6. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      7. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      8. >>>>>>> 4e81ea2 (Featire specs) =======
      9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      10. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      12. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      14. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      16. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      18. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      21. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      23. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      24. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      25. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 describe 'authors_book' do
      26. <<<<<<< HEAD
      27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      28. =======
      29. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      30. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      31. >>>>>>> 4e81ea2 (Featire specs) =======
      32. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      35. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      36. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      37. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      38. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      39. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      40. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      43. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      44. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      45. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      47. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      48. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 context 'when validations' do
      49. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      50. 2 it { is_expected.to validate_presence_of(:book) }
      51. 2 it { is_expected.to validate_presence_of(:author) }
      52. end
      53. 1 context 'when associations' do
      54. 2 it { is_expected.to belong_to(:author) }
      55. 2 it { is_expected.to belong_to(:book) }
      56. end
      57. end
      58. end

      spec/models/billing_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Billing, type: :model do
      2. 1 describe 'billing' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      7. 2 <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      8. 2 <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      9. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      13. <<<<<<< HEAD ======= =======
      14. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      15. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      16. >>>>>>> 4e81ea2 (Featire specs) =======
      17. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      22. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      24. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      25. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      28. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      29. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      32. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      33. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      34. <<<<<<< HEAD
      35. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      36. =======
      37. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      38. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      39. >>>>>>> 4e81ea2 (Featire specs) =======
      40. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      41. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      42. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      43. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      44. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      45. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      46. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      48. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      49. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      52. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      57. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      58. 1 context 'when not validations' do
      59. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      60. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      61. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      62. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      63. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      64. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      65. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      66. end
      67. <<<<<<< HEAD ======= =======
      68. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      69. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      70. >>>>>>> 4e81ea2 (Featire specs) =======
      71. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      73. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      74. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      75. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      76. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      77. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      78. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      79. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      80. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      81. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      82. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      83. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      84. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      85. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      86. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      87. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 context 'when associations' do
      88. <<<<<<< HEAD
      89. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      90. =======
      91. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      92. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      93. >>>>>>> 4e81ea2 (Featire specs) =======
      94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      96. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      97. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      98. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      99. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      102. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      103. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      104. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      105. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      106. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      108. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      110. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      111. <<<<<<< HEAD
      112. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      113. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      114. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      115. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      116. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      117. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      118. 2 it { is_expected.to belong_to(:book) }
      119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      120. <<<<<<< HEAD
      121. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      122. =======
      123. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      124. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      125. >>>>>>> 4e81ea2 (Featire specs) =======
      126. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      127. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      128. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      129. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      131. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      132. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      133. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      134. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      135. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      136. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      138. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      139. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      140. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      141. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      142. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      143. <<<<<<< HEAD
      144. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      145. =======
      146. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      147. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      148. >>>>>>> 4e81ea2 (Featire specs) =======
      149. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      150. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      151. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      152. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      153. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      154. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      155. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      156. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      157. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      158. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      159. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      160. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      161. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      162. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      163. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      164. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      165. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

      spec/models/book_spec.rb

      100.0% lines covered

      16 relevant lines. 16 lines covered and 0 lines missed.
          
      1. 1 <<<<<<< HEAD RSpec.describe Book, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= require 'rails_helper' <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2. <<<<<<< HEAD
      3. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      4. 1 =======
      5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      6. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      7. >>>>>>> 4e81ea2 (Featire specs) =======
      8. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      12. >>>>>>> 4e81ea2 (Featire specs) =======
      13. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD describe 'books' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      15. >>>>>>> 7a02bbe (Featire specs) =======
      16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      17. >>>>>>> 4e81ea2 (Featire specs) =======
      18. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      20. >>>>>>> 7a02bbe (Featire specs) =======
      21. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      22. 1 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe Book, type: :model do
      23. 1 describe 'books' do
      24. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) context 'when validations' do
      25. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      26. 2 it { is_expected.to validate_presence_of(:title) }
      27. 2 it { is_expected.to validate_presence_of(:description) }
      28. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      29. 2 <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      30. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      31. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      32. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      33. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:quantity) }
      34. 2 it { is_expected.to validate_presence_of(:materials) }
      35. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:dimensions) }
      36. <<<<<<< HEAD
      37. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      38. =======
      39. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      40. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      41. >>>>>>> 4e81ea2 (Featire specs) =======
      42. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      43. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      44. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      45. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      46. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      47. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      48. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      50. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      54. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      55. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      56. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      57. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      58. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      59. <<<<<<< HEAD
      60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      61. =======
      62. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      63. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      64. >>>>>>> 4e81ea2 (Featire specs) =======
      65. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      66. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      67. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      68. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      69. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      70. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      71. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      73. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      74. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      75. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      76. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      77. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      80. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      81. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      82. <<<<<<< HEAD
      83. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      84. =======
      85. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      86. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      87. >>>>>>> 4e81ea2 (Featire specs) =======
      88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      89. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      90. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      91. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      92. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      93. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      96. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      97. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      98. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      100. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      101. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      103. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      104. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 context 'when associations' do
      105. <<<<<<< HEAD
      106. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      107. =======
      108. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      109. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      110. >>>>>>> 4e81ea2 (Featire specs) =======
      111. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      113. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      116. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      117. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      118. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      119. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      120. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      121. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      123. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      124. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      125. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      126. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      127. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
      128. <<<<<<< HEAD
      129. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      130. =======
      131. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      132. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      133. >>>>>>> 4e81ea2 (Featire specs) =======
      134. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      135. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      136. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      137. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      138. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      139. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      140. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      141. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      142. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      143. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      144. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      145. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      146. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      147. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      149. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      150. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
      151. <<<<<<< HEAD
      152. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      153. =======
      154. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      155. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      156. >>>>>>> 4e81ea2 (Featire specs) =======
      157. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      158. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      159. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      160. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      161. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      162. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      163. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      164. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      165. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      166. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      167. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      168. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      169. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      170. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      171. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      172. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      173. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      174. <<<<<<< HEAD
      175. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      176. =======
      177. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      178. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      179. >>>>>>> 4e81ea2 (Featire specs) =======
      180. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      182. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      184. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      185. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      186. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      187. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      188. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      189. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      190. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      191. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      192. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      193. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      194. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      195. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      196. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      197. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      198. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
      199. <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      200. 2 <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      201. end
      202. end
      203. end

      spec/models/books_category_spec.rb

      100.0% lines covered

      <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 8 relevant lines. 8 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe BooksCategory, type: :model do
      2. 1 describe 'books_categories' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:book) }
      5. 2 it { is_expected.to validate_presence_of(:category) }
      6. end
      7. 1 context 'when associations' do
      8. 2 it { is_expected.to belong_to(:category) }
      9. 2 it { is_expected.to belong_to(:book) }
      10. end
      11. end
      12. end

      spec/models/category_spec.rb

      100.0% lines covered

      7 relevant lines. 7 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Category, type: :model do
      2. 1 describe 'category' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to validate_presence_of(:name) }
      5. end
      6. 1 context 'when associations' do
      7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      9. end
      10. end
      11. end

      spec/models/review_spec.rb

      100.0% lines covered

      14 relevant lines. 14 lines covered and <<<<<<< HEAD ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe Review, type: :model do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      3. 1 <<<<<<< HEAD describe 'review' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'books_categories' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      4. 1 context 'when validations' do
      5. 2 <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 2 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to validate_presence_of(:body) }
      7. 2 it { is_expected.to validate_presence_of(:rating) }
      8. 2 it { is_expected.to validate_presence_of(:verified) }
      9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
      10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
      11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
      12. end
      13. 1 context 'when associations' do
      14. 2 it { is_expected.to belong_to(:book) }
      15. 2 it { is_expected.to belong_to(:user) }
      16. end
      17. end
      18. end

      spec/models/shipping_spec.rb

      100.0% lines covered

      20 relevant lines. 20 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe Shipping, type: :model do
      2. 1 describe 'shipping' do
      3. 1 context 'when validations' do
      4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
      5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
      6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
      7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
      8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
      9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
      10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
      11. end
      12. 1 context 'when not validations' do
      13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
      14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
      15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
      16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
      17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
      18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
      19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
      20. end
      21. 1 context 'when associations' do
      22. 2 it { is_expected.to belong_to(:user) }
      23. end
      24. end
      25. end

      spec/models/user_spec.rb

      100.0% lines covered

      9 relevant lines. 9 lines covered and 0 lines missed.
          
      1. 1 RSpec.describe User, type: :model do
      2. 1 let(:user) { FactoryBot.create(:user) }
      3. 1 describe 'author' do
      4. 1 context 'when validations' do
      5. 2 it { is_expected.to validate_presence_of(:email) }
      6. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      7. end
      8. 1 <<<<<<< HEAD context 'with associations' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= context 'when associations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      9. 2 <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      10. 2 <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      11. end
      12. end
      13. end
      <<<<<<< HEAD

      spec/queryes/book_query_spec.rb

      ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/queryes/book_query_spec.rb

      =======

      spec/models/category_spec.rb

      >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)

      spec/models/category_spec.rb

      >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> 4e81ea2 (Featire specs) =======

      spec/models/category_spec.rb

      >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

      spec/models/category_spec.rb

      >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======

      spec/models/category_spec.rb

      >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      100.0% lines covered

      <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 <<<<<<< HEAD RSpec.describe BookQuery do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      3. 1 <<<<<<< HEAD shared_examples 'sort test' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) describe 'category' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= describe 'category' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      4. <<<<<<< HEAD
      5. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 5 =======
      7. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      8. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      9. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      10. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      11. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      12. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      13. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      14. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      15. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD it 'sort' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      16. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      17. 1 >>>>>>> 7a02bbe (Featire specs) =======
      18. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      19. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      20. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      21. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      22. 1 >>>>>>> 7a02bbe (Featire specs) =======
      23. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= context 'when validations' do <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      24. <<<<<<< HEAD
      25. 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      26. 5 =======
      27. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      28. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      29. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      30. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) =======
      31. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) =======
      32. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      33. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      34. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      35. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD books ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= =======
      36. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      37. 2 >>>>>>> 7a02bbe (Featire specs) =======
      38. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      39. 2 >>>>>>> 4e81ea2 (Featire specs) =======
      40. 2 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= =======
      41. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      42. 2 >>>>>>> 7a02bbe (Featire specs) =======
      43. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      44. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      45. 5 expect(test).to eq(result)
      46. <<<<<<< HEAD ======= =======
      47. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      48. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      49. >>>>>>> 4e81ea2 (Featire specs) =======
      50. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      52. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      54. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      55. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      56. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      57. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      58. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= =======
      59. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      60. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      61. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      62. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      63. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      65. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      66. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      67. <<<<<<< HEAD
      68. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      69. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      70. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      71. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      72. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      73. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      74. 1 context 'when associations' do
      75. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
      76. 2 it { is_expected.to have_many(:books).through(:books_categories) }
      77. end
      78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      79. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      80. end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 70fcacc (Featire specs) ======= >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 56fd9d41 (Add login registration pages) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/models/user_spec.rb

      100.0% lines covered

      3 relevant lines. 3 lines covered and 0 lines missed.
          
      1. 1 require 'rails_helper'
      2. 1 RSpec.describe User, type: :model do
      3. 1 pending "add some examples to (or delete) #{__FILE__}"
      4. end
      <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= >>>>>>> 29e1af94 (Add login registration pages) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a8b17c32 (Add login registration pages) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88d49ad (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> bae2b7de (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 156ffe6 (Add login registration pages) <<<<<<< HEAD >>>>>>> 6066f925 (Add login registration pages) ======= ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 793a6ed (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8249ff3c (Add login registration pages) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e989024d (Add login registration pages) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> 29e1af94 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 156ffe6 (Add login registration pages) >>>>>>> bae2b7de (Add login registration pages) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 56fd9d41 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> c5efe8e (Add login registration pages) >>>>>>> 56fd9d41 (Add login registration pages) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) >>>>>>> 31507b8 (Add login registration pages) <<<<<<< HEAD >>>>>>> a8b17c32 (Add login registration pages) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/rails_helper.rb

      87.5% lines covered

      16 relevant lines. 14 lines covered and 2 lines missed.
          
      1. 1 require 'spec_helper'
      2. 1 ENV['RAILS_ENV'] ||= 'test'
      3. 1 require_relative '../config/environment'
      4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
      5. 1 require 'rspec/rails'
      6. 1 require 'shoulda-matchers'
      7. 1 require_relative 'support/configs/shoulda_matcher'
      8. 1 require_relative 'support/configs/capybara'
      9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 70fcacc (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> aca90e3 (Rebased) >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      10. <<<<<<< HEAD <<<<<<< HEAD
      11. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      12. 3 =======
      13. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      14. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      15. >>>>>>> 4e81ea2 (Featire specs) =======
      16. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      18. >>>>>>> 4e81ea2 (Featire specs) =======
      19. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      20. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
      21. >>>>>>> 4e81ea2 (Featire specs) =======
      22. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= =======
      23. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      24. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      25. 3 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) begin >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) begin >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= begin <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= begin >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      26. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books_dates) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:books_dates) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      27. <<<<<<< HEAD <<<<<<< HEAD
      28. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      29. 1 =======
      30. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      31. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD
      32. >>>>>>> 4e81ea2 (Featire specs) =======
      33. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      34. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs)
      35. >>>>>>> 4e81ea2 (Featire specs) =======
      36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= =======
      40. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      41. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      42. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      44. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      45. =======
      46. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      47. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      48. >>>>>>> 4e81ea2 (Featire specs) =======
      49. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      50. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= =======
      51. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= =======
      52. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      53. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= =======
      54. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      55. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= =======
      56. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      57. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      58. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      59. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      60. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= end >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= puts e.to_s.strip <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      61. <<<<<<< HEAD <<<<<<< HEAD
      62. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      63. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      64. ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD
      65. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> efd6af09 (Featire specs)
      66. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) =======
      67. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      68. exit 1
      69. end
      70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) =======
      71. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      72. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      73. 1 describe 'all books sort' do
      74. 1 context 'when sort by title A to Z' do
      75. <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      76. 1 <<<<<<< HEAD <<<<<<< HEAD let(:books) do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= let(:books) do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      77. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.first) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.first) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      78. 1 <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.second) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= create(:book, title: titles.second) >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      79. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      80. end
      81. 2 let(:result) { titles.second }
      82. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
      83. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      84. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      85. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      86. >>>>>>> 4e81ea2 (Featire specs) =======
      87. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      88. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      89. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      90. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      91. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      92. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      93. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      94. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      95. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      96. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_examples 'sort test' ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= include_examples 'sort test' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      97. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      98. end
      99. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      100. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      101. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      102. >>>>>>> 4e81ea2 (Featire specs) =======
      103. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      104. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      105. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      106. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      108. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      109. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      110. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      111. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      112. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when sort title Z to A' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      113. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      114. 1 let(:books) do
      115. 1 create(:book, title: titles.first)
      116. 1 create(:book, title: titles.second)
      117. end
      118. 2 let(:result) { titles.first }
      119. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
      120. 1 include_examples 'sort test'
      121. end
      122. 1 context 'when sort by price High to Low' do
      123. 1 let(:books) do
      124. 1 create(:book, price_cents: 75)
      125. 1 create(:book, price_cents: 23)
      126. end
      127. 2 let(:result) { 75 }
      128. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
      129. 1 include_examples 'sort test'
      130. end
      131. 1 context 'when sort price Low to High' do
      132. 1 let(:books) do
      133. 1 create(:book, price_cents: 75)
      134. 1 create(:book, price_cents: 23)
      135. end
      136. 2 let(:result) { 23 }
      137. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
      138. 1 include_examples 'sort test'
      139. end
      140. 1 context 'when sort by Newest' do
      141. 1 let(:books) do
      142. 1 create(:book, created_at: books_dates.first)
      143. 1 create(:book, created_at: books_dates.second)
      144. end
      145. 2 let(:result) { books_dates.first }
      146. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
      147. 1 include_examples 'sort test'
      148. end
      149. end
      150. <<<<<<< HEAD <<<<<<< HEAD ======= =======
      151. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      152. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      153. >>>>>>> 4e81ea2 (Featire specs) =======
      154. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      155. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      156. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      157. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      158. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      159. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      160. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      161. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) =======
      162. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      163. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)

      spec/support/configs/capybara.rb

      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) 36.84% >>>>>>> bd8bda4 (Manifest_cache true) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 36.84% >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 100.0% >>>>>>> c7a726c5 (Rebased) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) lines covered

      19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) 19 lines covered and 0 lines missed. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 19 lines covered and 0 lines missed. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0f8241bb (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> c7a726c5 (Rebased) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
          
        <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2. 1 =======
      3. >>>>>>> 752f0c0 (Featire specs) =======
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) =======
      6. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
      7. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) ======= =======
      8. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      9. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      10. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) Capybara.configure do |config| >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) Capybara.configure do |config| <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      11. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
      12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
      13. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= Capybara.configure do |config| >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
      15. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
      16. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      18. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      19. 1 =======
      20. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
      21. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee511 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      22. =======
      23. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      24. =======
      25. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs)
      26. =======
      27. >>>>>>> aa7b40c (Manifest_cache true) 1 ======= >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      28. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      29. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      31. =======
      32. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      33. >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      34. <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) =======
      35. ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= =======
      36. >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      37. =======
      38. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs)
      39. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      40. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
      41. >>>>>>> 86d584a (Manifest_cache true)
      42. >>>>>>> 009401d (Featire specs) =======
      43. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      44. <<<<<<< HEAD
      45. =======
      46. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      47. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
      48. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) =======
      49. 1 >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      50. <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      51. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs)
      52. <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) =======
      53. =======
      54. >>>>>>> fd6db03 (Manifest_cache true) 1 ======= config.server_port = 3001 ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      56. =======
      57. =======
      58. <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      59. =======
      60. ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      61. =======
      62. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      63. ======= >>>>>>> 0f8241bb (Featire specs)
      64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD =======
      65. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) config.javascript_driver = :headless_chrome ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> df37394 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      66. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      67. =======
      68. =======
      69. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      70. =======
      71. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs)
      72. ======= >>>>>>> 5c33a07 (Featire specs)
      73. <<<<<<< HEAD =======
      74. >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      75. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      76. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
      78. =======
      79. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      80. =======
      81. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      82. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      83. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      84. <<<<<<< HEAD <<<<<<< HEAD
      85. =======
      86. =======
      87. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs)
      88. <<<<<<< HEAD
      89. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
      90. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      91. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
      92. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
      93. 1 >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD end >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 490b01d6 (Manifest_cache true) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
      94. =======
      95. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs)
      96. <<<<<<< HEAD ======= <<<<<<< HEAD =======
      97. >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= >>>>>>> 490b01d6 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      99. =======
      100. =======
      101. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      102. =======
      103. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      104. =======
      105. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      106. =======
      107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      108. >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      109. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      110. =======
      111. =======
      112. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      113. =======
      114. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      115. ======= >>>>>>> 5c33a07 (Featire specs)
      116. =======
      117. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      118. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 490b01d6 (Manifest_cache true)
      119. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= config.default_max_wait_time = 5 ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) config.default_driver = :rack_test >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end ======= >>>>>>> 84809242 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD
      121. =======
      122. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      123. =======
      124. >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs)
      125. >>>>>>> 6da9530 (Featire specs) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      126. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      127. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      128. <<<<<<< HEAD <<<<<<< HEAD
      129. =======
      130. =======
      131. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 84809242 (Featire specs) config.default_max_wait_time = 5 <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      132. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs)
      133. =======
      134. =======
      135. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      136. ======= >>>>>>> 5c33a07 (Featire specs)
      137. =======
      138. =======
      139. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      140. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
      141. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= =======
      142. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      143. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= config.server_port = 3001 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      144. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      145. ======= =======
      146. =======
      147. >>>>>>> c8cdb08 (Manifest_cache true) =======
      148. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
      149. >>>>>>> 24b58e6 (Manifest_cache true) =======
      150. >>>>>>> 00f8b58 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 >>>>>>> 11792758 (Rebased)
      151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      152. >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      153. =======
      154. ======= >>>>>>> 5c33a07 (Featire specs)
      155. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      156. <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      157. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> 11792758 (Rebased)
      158. <<<<<<< HEAD =======
      159. 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 <<<<<<< HEAD
      160. >>>>>>> 34509eee (Featire specs)
      161. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 6e923b9d (Featire specs)
      162. 1 ======= >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      163. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      164. =======
      165. =======
      166. >>>>>>> 490b01d6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      167. <<<<<<< HEAD
      168. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      169. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      170. =======
      171. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      172. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      173. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      174. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD
      175. <<<<<<< HEAD ======= =======
      176. =======
      177. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      178. =======
      179. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      180. ======= >>>>>>> 5c33a07 (Featire specs)
      181. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      182. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      183. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      184. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      185. =======
      186. ======= >>>>>>> 5c33a07 (Featire specs)
      187. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      188. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      189. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      190. <<<<<<< HEAD <<<<<<< HEAD
      191. =======
      192. =======
      193. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
      194. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs)
      195. =======
      196. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
      197. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      198. =======
      199. =======
      200. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      201. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
      202. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      203. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      204. ======= ======= >>>>>>> 563720e (Featire specs) =======
      205. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      206. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      207. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
      208. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) =======
      209. =======
      210. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      211. =======
      212. >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs)
      213. ======= >>>>>>> 5c33a07 (Featire specs)
      214. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      215. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD =======
      216. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs)
      217. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      218. =======
      219. ======= >>>>>>> 5c33a07 (Featire specs)
      220. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
      221. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      222. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
      223. <<<<<<< HEAD <<<<<<< HEAD
      224. =======
      225. =======
      226. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs)
      227. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs)
      228. =======
      229. 1 >>>>>>> d0dc1f1 (Featire specs) =======
      230. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= =======
      231. =======
      232. =======
      233. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
      234. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD ======= ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased)
      235. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      236. <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      237. ======= ======= >>>>>>> 563720e (Featire specs) =======
      238. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c7a726c5 (Rebased)
      239. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      240. >>>>>>> 86d584a (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs)
      241. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) =======
      242. =======
      243. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      244. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      245. ======= >>>>>>> 5c33a07 (Featire specs)
      246. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      247. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      248. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs) ======= config.server_port = 3001 >>>>>>> c7a726c5 (Rebased)
      249. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      250. =======
      251. >>>>>>> e9f3851 (Manifest_cache true) =======
      252. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      253. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      254. =======
      255. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      256. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      257. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      258. =======
      259. >>>>>>> e9f3851 (Manifest_cache true) =======
      260. >>>>>>> d782a28 (Manifest_cache true) =======
      261. >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      262. =======
      263. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      264. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) =======
      265. >>>>>>> c59d1a99 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      266. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      267. =======
      268. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
      269. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      270. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) =======
      271. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
      272. >>>>>>> c033601 (Rebased)
      273. >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c7a726c5 (Rebased)
      274. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      275. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      276. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      277. =======
      278. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      279. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      280. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
      281. =======
      282. >>>>>>> c7a726c5 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      283. <<<<<<< HEAD <<<<<<< HEAD
      284. ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs)
      285. =======
      286. =======
      287. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) =======
      288. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      289. ======= >>>>>>> 5c33a07 (Featire specs)
      290. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      291. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      292. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      293. =======
      294. ======= >>>>>>> 5c33a07 (Featire specs)
      295. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      296. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      297. <<<<<<< HEAD
      298. =======
      299. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      300. >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) end ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
      301. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      302. =======
      303. >>>>>>> e9f3851 (Manifest_cache true) =======
      304. <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      305. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      306. =======
      307. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      308. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      309. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      310. =======
      311. >>>>>>> e9f3851 (Manifest_cache true) =======
      312. >>>>>>> d782a28 (Manifest_cache true) =======
      313. >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs)
      314. =======
      315. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      316. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      317. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      318. =======
      319. <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true)
      320. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
      321. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs)
      322. >>>>>>> c033601 (Rebased)
      323. <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      324. <<<<<<< HEAD <<<<<<< HEAD
      325. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      326. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
      327. =======
      328. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      329. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      330. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) =======
      331. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 6da9530 (Featire specs)
      332. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      333. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
      334. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      335. =======
      336. >>>>>>> 752f0c0 (Featire specs) =======
      337. >>>>>>> bd8bda4 (Manifest_cache true) =======
      338. >>>>>>> 4e81ea2 (Featire specs) =======
      339. >>>>>>> aa7b40c (Manifest_cache true) =======
      340. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD 1 <<<<<<< HEAD ======= =======
      341. <<<<<<< HEAD =======
      342. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      343. <<<<<<< HEAD =======
      344. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> d8dd3b4a (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> c05ee511 (Featire specs) Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= end >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs)
      345. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      346. ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) =======
      347. >>>>>>> e9f3851 (Manifest_cache true) =======
      348. ======= ======= >>>>>>> 36356d3 (Featire specs)
      349. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) =======
      350. >>>>>>> e3e66f3 (Featire specs) ======= =======
      351. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) =======
      352. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      353. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD
      354. =======
      355. =======
      356. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      357. =======
      358. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      359. =======
      360. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      361. =======
      362. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs)
      363. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      364. =======
      365. =======
      366. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      367. =======
      368. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      369. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      370. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
      371. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
      372. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
      373. =======
      374. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      375. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      376. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      377. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
      378. =======
      379. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      380. =======
      381. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      382. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      383. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      384. =======
      385. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
      386. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      387. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs)
      388. =======
      389. =======
      390. >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      391. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
      392. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      393. <<<<<<< HEAD <<<<<<< HEAD
      394. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= >>>>>>> c59d1a99 (Manifest_cache true)
      395. 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true)
      396. <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      397. =======
      398. =======
      399. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      400. =======
      401. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
      402. ======= >>>>>>> 5c33a07 (Featire specs)
      403. ======= >>>>>>> c59d1a99 (Manifest_cache true)
      404. >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      405. 1 <<<<<<< HEAD ======= >>>>>>> 64dceec (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
      406. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs)
      407. =======
      408. =======
      409. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      410. =======
      411. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      412. =======
      413. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      414. =======
      415. =======
      416. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      417. 1 >>>>>>> 08edf50 (Featire specs) =======
      418. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs)
      419. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
      420. ======= =======
      421. =======
      422. >>>>>>> c8cdb08 (Manifest_cache true) =======
      423. >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs)
      424. 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs)
      425. 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
      426. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
      427. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      428. =======
      429. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      430. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      431. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
      432. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      433. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      434. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      435. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs)
      436. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      437. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      438. =======
      439. >>>>>>> 752f0c0 (Featire specs) =======
      440. >>>>>>> bd8bda4 (Manifest_cache true) =======
      441. >>>>>>> 4e81ea2 (Featire specs) =======
      442. >>>>>>> aa7b40c (Manifest_cache true) =======
      443. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      444. >>>>>>> c033601 (Rebased) 1 =======
      445. <<<<<<< HEAD <<<<<<< HEAD =======
      446. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      447. <<<<<<< HEAD =======
      448. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 37e48018 (Featire specs) ======= ======= config.default_driver = :rack_test ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= end >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      449. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      450. =======
      451. >>>>>>> e9f3851 (Manifest_cache true) =======
      452. ======= ======= >>>>>>> 36356d3 (Featire specs)
      453. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) =======
      454. >>>>>>> e3e66f3 (Featire specs) ======= =======
      455. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      456. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD
      457. =======
      458. =======
      459. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      460. =======
      461. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      462. =======
      463. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
      464. =======
      465. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
      466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      467. =======
      468. =======
      469. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      470. =======
      471. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      472. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      473. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
      474. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
      475. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
      476. =======
      477. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      478. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      479. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      480. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
      481. =======
      482. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      483. =======
      484. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
      485. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      486. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      487. =======
      488. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
      489. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs)
      491. =======
      492. =======
      493. >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      494. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
      495. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      496. <<<<<<< HEAD <<<<<<< HEAD
      497. <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      498. 1 config.default_max_wait_time = 5
      499. >>>>>>> 64dceec (Manifest_cache true)
      500. >>>>>>> 8cbdfeb (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= config.default_driver = :rack_test ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      501. 1 <<<<<<< HEAD ======= >>>>>>> 64dceec (Manifest_cache true) config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      502. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      503. =======
      504. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
      505. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      506. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
      507. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= =======
      508. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      509. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      510. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      511. =======
      512. >>>>>>> 752f0c0 (Featire specs) =======
      513. >>>>>>> bd8bda4 (Manifest_cache true) =======
      514. >>>>>>> 4e81ea2 (Featire specs) =======
      515. >>>>>>> aa7b40c (Manifest_cache true) =======
      516. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
      517. >>>>>>> c033601 (Rebased) 1 =======
      518. =======
      519. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
      520. =======
      521. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD ======= end ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      522. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      523. =======
      524. =======
      525. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      526. =======
      527. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      528. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs)
      529. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs)
      530. =======
      531. ======= ======= >>>>>>> 84003439 (Featire specs)
      532. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      533. =======
      534. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      535. >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      536. >>>>>>> 37e48018 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      537. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      538. ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      539. >>>>>>> 84809242 (Featire specs) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased)
      540. <<<<<<< HEAD
      541. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      542. ======= <<<<<<< HEAD
      543. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      544. =======
      545. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      546. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) =======
      547. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      548. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= end
      549. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 34509eee (Featire specs)
      550. >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      551. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      552. >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> bf554f4 (Rebased)
      553. >>>>>>> 11792758 (Rebased) end
      554. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased)
      555. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      556. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      557. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= =======
      558. >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= end
      559. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs)
      560. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      561. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs)
      562. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= =======
      563. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs)
      564. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> ae07231a (Featire specs)
      565. >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      566. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) =======
      567. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
      568. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> ae07231a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= end >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> ae07231a (Featire specs) ======= >>>>>>> ef483b6d (Fix)
      569. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true)
      570. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      571. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      572. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      573. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      574. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      575. ======= =======
      576. 1 <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) config.default_driver = :rack_test
      577. >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
      578. >>>>>>> 96aecde (Manifest_cache true) =======
      579. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
      580. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
      581. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased)
      582. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= =======
      583. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      584. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      585. ======= ======= >>>>>>> 4fac471d (Manifest_cache true)
      586. >>>>>>> 96aecde (Manifest_cache true) =======
      587. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
      588. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
      589. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      590. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      591. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      592. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      593. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      594. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 932dbec (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true)
      595. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      596. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      597. =======
      598. >>>>>>> 752f0c0 (Featire specs) =======
      599. >>>>>>> bd8bda4 (Manifest_cache true) =======
      600. >>>>>>> 4e81ea2 (Featire specs) =======
      601. >>>>>>> aa7b40c (Manifest_cache true) =======
      602. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
      603. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      604. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> bc6bc8d2 (Rebased)
      605. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      606. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) 1 ======= <<<<<<< HEAD ======= 1 ======= >>>>>>> 6da9530 (Featire specs)
      607. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      608. 1 >>>>>>> 752f0c0 (Featire specs) =======
      609. >>>>>>> bd8bda4 (Manifest_cache true) =======
      610. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      611. >>>>>>> aa7b40c (Manifest_cache true) =======
      612. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      613. >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 11792758 (Rebased) =======
      614. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      615. =======
      616. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
      617. =======
      618. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 9a49b7b (Rebased) >>>>>>> 11792758 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 11792758 (Rebased) Capybara.register_driver :headless_chrome do |app| ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs)
      619. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      620. 1 ======= <<<<<<< HEAD <<<<<<< HEAD
      621. >>>>>>> ae2a012 (Manifest_cache true) =======
      622. 1 >>>>>>> 752f0c0 (Featire specs) =======
      623. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      624. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      625. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      626. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= =======
      627. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD
      628. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) =======
      629. ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) =======
      630. >>>>>>> 11792758 (Rebased) >>>>>>> 75fa7e1b (Rebased) =======
      631. 1 >>>>>>> 67ab5299 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) =======
      632. 1 >>>>>>> c7a726c5 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      633. <<<<<<< HEAD ======= <<<<<<< HEAD
      634. =======
      635. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      636. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
      637. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      638. =======
      639. >>>>>>> 752f0c0 (Featire specs) =======
      640. >>>>>>> bd8bda4 (Manifest_cache true) =======
      641. >>>>>>> 4e81ea2 (Featire specs) =======
      642. >>>>>>> aa7b40c (Manifest_cache true) =======
      643. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= ======= =======
      644. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) 1 ======= <<<<<<< HEAD
      645. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      646. 1 >>>>>>> 752f0c0 (Featire specs) =======
      647. >>>>>>> bd8bda4 (Manifest_cache true) =======
      648. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      649. >>>>>>> aa7b40c (Manifest_cache true) =======
      650. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) =======
      651. >>>>>>> 183b6c5 (Manifest_cache true) =======
      652. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      653. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      654. =======
      655. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
      656. =======
      657. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) Capybara.register_driver :headless_chrome do |app|
      658. 1 <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 11792758 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      659. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      660. =======
      661. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      662. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      663. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      664. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      665. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      666. >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix)
      667. end
      668. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      669. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      670. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      671. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      672. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      673. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      674. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true)
      675. ======= ======= >>>>>>> 183b6c5 (Manifest_cache true)
      676. =======
      677. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      678. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      679. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      680. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      681. >>>>>>> 5b7749a (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      682. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      683. <<<<<<< HEAD ======= ======= =======
      684. =======
      685. =======
      686. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs)
      687. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      688. >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 563720e (Featire specs) =======
      689. >>>>>>> 307f31f (Manifest_cache true) 1 =======
      690. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      691. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
      692. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      693. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
      694. 1 >>>>>>> 752f0c0 (Featire specs) =======
      695. >>>>>>> bd8bda4 (Manifest_cache true) =======
      696. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      697. >>>>>>> aa7b40c (Manifest_cache true) =======
      698. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) =======
      699. 1 <<<<<<< HEAD =======
      700. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      701. 1 >>>>>>> e3e66f3 (Featire specs) =======
      702. >>>>>>> ae2a012 (Manifest_cache true) =======
      703. 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      704. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      705. 1 >>>>>>> 08edf50 (Featire specs) =======
      706. 1 >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      707. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
      708. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      709. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      710. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
      711. >>>>>>> fd6db03 (Manifest_cache true) =======
      712. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
      713. >>>>>>> 49e8a6c (Rebased) =======
      714. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      715. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      716. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      717. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      718. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      719. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      720. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs)
      721. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      722. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      723. ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      724. >>>>>>> 59d75f9 (Featire specs) =======
      725. >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD
      726. 1 =======
      727. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      728. 1 >>>>>>> 752f0c0 (Featire specs) =======
      729. >>>>>>> bd8bda4 (Manifest_cache true) =======
      730. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      731. >>>>>>> aa7b40c (Manifest_cache true) =======
      732. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 490b01d6 (Manifest_cache true) client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= >>>>>>> 5507b42 (Featire specs) ======= ======= end >>>>>>> af057e3 (Featire specs) ======= ======= end >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix)
      733. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      734. =======
      735. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      736. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= =======
      737. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 64dceec (Manifest_cache true)
      738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      739. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      740. >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5b7749a (Fix)
      741. end
      742. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      743. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      744. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      745. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      746. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      747. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix)
      748. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true)
      749. ======= ======= >>>>>>> 183b6c5 (Manifest_cache true)
      750. =======
      751. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      752. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      753. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      754. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      755. >>>>>>> 5b7749a (Fix) =======
      756. >>>>>>> ebcdce06 (Featire specs) 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
      757. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      758. >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      759. ======= ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      760. >>>>>>> 84003439 (Featire specs) 1 =======
      761. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> 9a49b7b (Rebased) >>>>>>> 84003439 (Featire specs) ======= =======
      762. 1 >>>>>>> 752f0c0 (Featire specs) =======
      763. >>>>>>> bd8bda4 (Manifest_cache true) =======
      764. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      765. >>>>>>> aa7b40c (Manifest_cache true) =======
      766. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      767. ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
      768. <<<<<<< HEAD ======= ======= =======
      769. =======
      770. =======
      771. >>>>>>> e9f3851 (Manifest_cache true) 1 >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 5b7749a (Fix) Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs)
      772. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs)
      773. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) =======
      774. >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
      775. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) 1 =======
      776. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      777. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD =======
      778. 1 <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 4e81ea2 (Featire specs) =======
      779. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= <<<<<<< HEAD ======= =======
      780. 1 >>>>>>> 752f0c0 (Featire specs) =======
      781. >>>>>>> bd8bda4 (Manifest_cache true) =======
      782. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      783. >>>>>>> aa7b40c (Manifest_cache true) =======
      784. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) Capybara.register_driver :headless_chrome do |app|
      785. <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs)
      786. 1 <<<<<<< HEAD =======
      787. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      788. 1 >>>>>>> e3e66f3 (Featire specs) =======
      789. >>>>>>> ae2a012 (Manifest_cache true) =======
      790. 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      791. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      792. 1 >>>>>>> 08edf50 (Featire specs) =======
      793. 1 <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
      794. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
      795. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 009401d (Featire specs) ======= =======
      796. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      797. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD =======
      798. >>>>>>> fd6db03 (Manifest_cache true) =======
      799. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
      800. >>>>>>> 49e8a6c (Rebased) =======
      801. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      802. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      803. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) =======
      804. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      805. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= =======
      806. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      807. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) client = Selenium::WebDriver::Remote::Http::Default.new ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 0d6dd12 (Manifest_cache true) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= Capybara.register_driver :headless_chrome do |app| >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs)
      808. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      809. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      810. ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      811. >>>>>>> 59d75f9 (Featire specs) =======
      812. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      813. 1 =======
      814. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
      815. 1 >>>>>>> 752f0c0 (Featire specs) =======
      816. >>>>>>> bd8bda4 (Manifest_cache true) =======
      817. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      818. >>>>>>> aa7b40c (Manifest_cache true) =======
      819. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      820. >>>>>>> 183b6c5 (Manifest_cache true) =======
      821. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) =======
      822. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      823. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      824. =======
      825. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      826. 1 =======
      827. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      828. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      829. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      830. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      831. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      832. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      833. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      834. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      835. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      836. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      837. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      838. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      839. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      840. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      841. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      842. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      843. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      844. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      845. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      846. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      847. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      848. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      849. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      850. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      851. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      852. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      853. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      854. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      855. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) =======
      856. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      857. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      858. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      859. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      860. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      861. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      862. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      863. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      864. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      865. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      866. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      867. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      868. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      869. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      870. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      871. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      872. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      873. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      874. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) client.read_timeout = 150 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) client.read_timeout = 150 ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= client.read_timeout = 150 >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 0d6dd12 (Manifest_cache true) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 0d6dd12 (Manifest_cache true) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= client.read_timeout = 150 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= client = Selenium::WebDriver::Remote::Http::Default.new >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= client.read_timeout = 150 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      875. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      876. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      877. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      878. >>>>>>> 59d75f9 (Featire specs) =======
      879. >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD
      880. 1 =======
      881. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      882. 1 >>>>>>> 752f0c0 (Featire specs) =======
      883. >>>>>>> bd8bda4 (Manifest_cache true) =======
      884. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      885. >>>>>>> aa7b40c (Manifest_cache true) =======
      886. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      887. >>>>>>> 183b6c5 (Manifest_cache true) =======
      888. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      889. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      890. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      891. =======
      892. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      893. 1 =======
      894. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      895. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      896. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      897. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      898. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      899. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      900. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      901. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      902. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
      903. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      904. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      905. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      906. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      907. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      908. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      909. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      910. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      911. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      912. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      913. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      914. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      915. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      916. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      917. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      918. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      919. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      920. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      921. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      922. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      923. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      924. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      925. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      926. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      927. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      928. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      929. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      930. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      931. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= client.read_timeout = 150 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= client.read_timeout = 150 ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      932. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      933. ======= <<<<<<< HEAD
      934. 1 =======
      935. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      936. 1 >>>>>>> 752f0c0 (Featire specs) =======
      937. >>>>>>> bd8bda4 (Manifest_cache true) =======
      938. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      939. >>>>>>> aa7b40c (Manifest_cache true) =======
      940. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      941. >>>>>>> 183b6c5 (Manifest_cache true) =======
      942. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      943. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
      944. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      945. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      946. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      947. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      948. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true)
      949. =======
      950. 1 >>>>>>> 08edf50 (Featire specs) =======
      951. >>>>>>> 183b6c5 (Manifest_cache true) =======
      952. 1 >>>>>>> 7a02bbe (Featire specs) =======
      953. >>>>>>> fd6db03 (Manifest_cache true) =======
      954. 1 >>>>>>> 4552227 (Featire specs) =======
      955. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true)
      956. =======
      957. 1 >>>>>>> 08edf50 (Featire specs) =======
      958. >>>>>>> 183b6c5 (Manifest_cache true) =======
      959. 1 >>>>>>> 7a02bbe (Featire specs) =======
      960. >>>>>>> fd6db03 (Manifest_cache true) =======
      961. 1 >>>>>>> 4552227 (Featire specs) =======
      962. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      963. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs)
      964. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      965. ======= <<<<<<< HEAD
      966. 1 =======
      967. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      968. 1 >>>>>>> 752f0c0 (Featire specs) =======
      969. >>>>>>> bd8bda4 (Manifest_cache true) =======
      970. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      971. >>>>>>> aa7b40c (Manifest_cache true) =======
      972. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= =======
      973. >>>>>>> 183b6c5 (Manifest_cache true) =======
      974. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
      975. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
      976. 1 >>>>>>> 70fcacc (Featire specs) =======
      977. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
      978. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
      979. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
      980. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
      981. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      982. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
      983. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
      984. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
      985. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      986. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
      987. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      988. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      989. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      990. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= =======
      991. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      992. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      993. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      994. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      995. <<<<<<< HEAD
      996. =======
      997. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      998. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
      999. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      1000. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1001. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      1002. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1003. =======
      1004. 1 >>>>>>> 08edf50 (Featire specs) =======
      1005. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1006. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1007. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1008. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      1009. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1010. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1011. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1012. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1013. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1014. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1015. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1016. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      1017. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
      1018. >>>>>>> 49e8a6c (Rebased) =======
      1019. 1 >>>>>>> 872e675 (Fix) =======
      1020. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1021. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1022. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      1023. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1024. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1025. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1026. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1027. =======
      1028. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1029. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1030. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1031. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1032. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1033. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true)
      1034. ======= <<<<<<< HEAD
      1035. 1 =======
      1036. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1037. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1038. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1039. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1040. <<<<<<< HEAD
      1041. =======
      1042. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1043. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1044. 1 >>>>>>> 08edf50 (Featire specs) =======
      1045. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1046. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1047. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1048. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1049. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) options.headless! >>>>>>> 84003439 (Featire specs)
      1050. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1051. =======
      1052. 1 >>>>>>> 08edf50 (Featire specs) =======
      1053. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1054. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1055. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1056. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      1057. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1058. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1059. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1060. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1061. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1062. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1063. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1064. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) =======
      1065. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
      1066. >>>>>>> 49e8a6c (Rebased) =======
      1067. 1 >>>>>>> 872e675 (Fix) =======
      1068. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1069. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1070. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      1071. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1072. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1073. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1074. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1075. =======
      1076. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1077. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1078. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1079. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1080. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1081. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true)
      1082. ======= <<<<<<< HEAD
      1083. 1 =======
      1084. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1085. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1086. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1087. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new
      1088. <<<<<<< HEAD
      1089. =======
      1090. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1091. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1092. 1 >>>>>>> 08edf50 (Featire specs) =======
      1093. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1094. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD =======
      1095. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1096. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1097. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1098. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) options.headless!
      1099. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1100. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1101. =======
      1102. >>>>>>> 752f0c0 (Featire specs) =======
      1103. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1104. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1105. >>>>>>> aa7b40c (Manifest_cache true) =======
      1106. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) =======
      1107. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1108. =======
      1109. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1110. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1111. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
      1112. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1113. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      1114. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1115. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1116. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      1117. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1118. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1119. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1120. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      1121. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1122. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1123. =======
      1124. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1125. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1126. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1127. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1128. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1129. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      1130. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      1131. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      1132. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1133. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      1134. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1135. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1136. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1137. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1138. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      1139. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1140. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1141. =======
      1142. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1143. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1144. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1145. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1146. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1147. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      1148. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      1149. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      1150. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1151. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      1152. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1153. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1154. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1155. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> c12b71de (Featire specs) >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1156. 1 =======
      1157. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1158. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1159. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1160. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1161. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1162. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1163. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1164. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1165. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1166. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1167. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1168. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1169. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> e59c273d (Manifest_cache true) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1170. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1171. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1172. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1173. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      1174. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      1175. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1176. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> fdab719f (Fix) =======
      1177. <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1178. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1179. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      1180. 1 >>>>>>> c7a726c5 (Rebased) =======
      1181. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1182. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1183. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1184. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1185. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1186. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1187. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= ======= >>>>>>> c8da2e3 (Fix) ======= >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 557c1b8 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1188. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 557c1b8 (Fix) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) =======
      1189. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      1190. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1191. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1192. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1193. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1194. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--no-sandbox')
      1195. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1196. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      1197. ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1198. ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true)
      1199. 1 =======
      1200. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1201. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1202. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1203. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1204. >>>>>>> aa7b40c (Manifest_cache true) =======
      1205. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> d8abfed3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true) ======= ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1206. 1 =======
      1207. <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1208. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1209. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1210. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1211. >>>>>>> aa7b40c (Manifest_cache true) =======
      1212. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1213. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1214. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1215. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> ae07231a (Featire specs)
      1216. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1217. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1218. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= =======
      1219. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1220. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1221. ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1222. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= =======
      1223. <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= =======
      1224. 1 <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
      1225. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
      1226. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1227. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1228. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1229. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1230. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1231. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1232. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1233. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1234. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= =======
      1235. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= =======
      1236. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= =======
      1237. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= =======
      1238. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD options.add_argument('--disable-dev-shm-usage') >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1239. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1240. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1241. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1242. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1243. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1244. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1245. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1246. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1247. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1248. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1249. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1250. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      1251. 1 >>>>>>> c7a726c5 (Rebased) ======= options.add_argument('--disable-dev-shm-usage') ======= ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--no-sandbox') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1252. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1253. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1254. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1255. 1 ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) =======
      1256. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1257. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1258. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1259. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1260. >>>>>>> aa7b40c (Manifest_cache true) =======
      1261. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) options.add_argument('--disable-dev-shm-usage') ======= options.add_argument('--no-sandbox') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--no-sandbox') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--no-sandbox') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--no-sandbox') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      1262. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1263. 1 ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      1264. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      1265. 1 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) =======
      1266. 1 ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= =======
      1267. 1 ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1268. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1269. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1270. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1271. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1272. >>>>>>> aa7b40c (Manifest_cache true) =======
      1273. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1274. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1275. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1276. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1277. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      1278. >>>>>>> 02a399d (Manifest_cache true) =======
      1279. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) =======
      1280. =======
      1281. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1282. ======= <<<<<<< HEAD
      1283. 1 =======
      1284. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1285. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1286. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1287. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1288. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1289. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1290. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1291. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1292. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1293. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1294. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1295. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1296. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1297. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1298. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1299. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1300. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1301. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1302. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1303. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1304. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1305. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1306. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1307. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1308. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1309. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1310. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1311. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1312. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) =======
      1313. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      1314. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1315. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1316. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1317. >>>>>>> aa7b40c (Manifest_cache true) =======
      1318. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1319. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1320. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1321. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1322. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1323. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1324. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1325. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1326. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1327. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1328. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1329. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1330. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1331. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1332. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1333. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1334. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1335. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1336. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--window-size=1400,1400') ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--disable-dev-shm-usage') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1337. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1338. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1339. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      1340. >>>>>>> 59d75f9 (Featire specs) =======
      1341. >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD
      1342. 1 =======
      1343. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      1344. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1345. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1346. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1347. >>>>>>> aa7b40c (Manifest_cache true) =======
      1348. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1349. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1350. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1351. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1352. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1353. =======
      1354. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      1355. 1 =======
      1356. =======
      1357. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
      1358. ======= <<<<<<< HEAD
      1359. 1 =======
      1360. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824ea7c9 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1361. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1362. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1363. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1364. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1365. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1366. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1367. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1368. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1369. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1370. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1371. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1372. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1373. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1374. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1375. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1376. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1377. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1378. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1379. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1380. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1381. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1382. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1383. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1384. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1385. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1386. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1387. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1388. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) =======
      1389. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      1390. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1391. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1392. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1393. >>>>>>> aa7b40c (Manifest_cache true) =======
      1394. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1395. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1396. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1397. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1398. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1399. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1400. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1401. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1402. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1403. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1404. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1405. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1406. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1407. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1408. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1409. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1410. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1411. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1412. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--allow-insecure-localhost') ======= options.add_argument('--window-size=1400,1400') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--window-size=1400,1400') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--window-size=1400,1400') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--window-size=1400,1400') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= options.add_argument('--window-size=1400,1400') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1413. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1414. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1415. ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price)
      1416. >>>>>>> 59d75f9 (Featire specs) =======
      1417. >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD
      1418. 1 =======
      1419. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      1420. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1421. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1422. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1423. >>>>>>> aa7b40c (Manifest_cache true) =======
      1424. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1425. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1426. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1427. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1428. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1429. ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) =======
      1430. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      1431. 1 =======
      1432. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
      1433. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1434. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1435. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1436. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) ======= ======= =======
      1437. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> adc21e0 (Featire specs) ======= ======= =======
      1438. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1439. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1440. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 4d90e3d (Featire specs) ======= ======= =======
      1441. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1442. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) ======= =======
      1443. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> aa3618b (Rebased) ======= =======
      1444. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1445. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1446. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1447. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1448. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1449. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1450. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1451. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1452. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1453. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1454. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1455. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs)
      1456. ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1457. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1458. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1459. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1460. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) =======
      1461. <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD
      1462. 1 =======
      1463. ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs)
      1464. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs)
      1465. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1466. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1467. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
      1468. 1 =======
      1469. >>>>>>> ebcdce06 (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) =======
      1470. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1471. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1472. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1473. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1474. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1475. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1476. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1477. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1478. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1479. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1480. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1481. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1482. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1483. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1484. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1485. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1486. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1487. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs)
      1488. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
      1489. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1490. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1491. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1492. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1493. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1494. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1495. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1496. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ef483b6d (Fix) ======= =======
      1497. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1498. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= =======
      1499. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1500. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1501. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1502. >>>>>>> aa7b40c (Manifest_cache true) =======
      1503. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1504. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1505. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= =======
      1506. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1507. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1508. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
      1509. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
      1510. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1511. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1512. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
      1513. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
      1514. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
      1515. >>>>>>> bf554f4 (Rebased) =======
      1516. 1 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= options.add_argument('--allow-insecure-localhost') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 0d6dd12 (Manifest_cache true) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--allow-insecure-localhost') <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--allow-insecure-localhost') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1517. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1518. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> b3f2049 (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= <<<<<<< HEAD >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> fdab719f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs)
      1519. ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1520. >>>>>>> 59d75f9 (Featire specs) =======
      1521. >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD
      1522. 1 =======
      1523. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) ======= =======
      1524. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1525. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1526. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1527. >>>>>>> aa7b40c (Manifest_cache true) =======
      1528. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9bfbd88 (Featire specs) >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) ======= =======
      1529. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1530. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1531. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1532. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 78717cc (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1533. =======
      1534. >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD
      1535. 1 =======
      1536. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1537. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> ae07231a (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= =======
      1538. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= =======
      1539. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= =======
      1540. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= ======= =======
      1541. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= =======
      1542. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= =======
      1543. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1544. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) ======= =======
      1545. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1546. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1547. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1548. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1549. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1550. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1551. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1552. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1553. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1554. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1555. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1556. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1557. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1558. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1559. 1 >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= ======= =======
      1560. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1561. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
      1562. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
      1563. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
      1564. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1565. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1566. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
      1567. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1568. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1569. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1570. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1571. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1572. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1573. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 311e9fa (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d52f9efe (Featire specs) >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae07231a (Featire specs) >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 311e9fa (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 932dbec (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> 77d62af (Featire specs) >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') ======= >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1574. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1575. ======= <<<<<<< HEAD
      1576. 1 =======
      1577. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1578. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1579. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1580. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1581. >>>>>>> aa7b40c (Manifest_cache true) =======
      1582. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      1583. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1584. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
      1585. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
      1586. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1587. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= =======
      1588. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1589. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1590. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1591. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1592. 1 ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 84d0df6 (Manifest_cache true) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 450f4e3 (Manifest_cache true) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> adc21e0 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4d90e3d (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price)
      1593. ======= <<<<<<< HEAD
      1594. 1 =======
      1595. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1596. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1597. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1598. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1599. >>>>>>> aa7b40c (Manifest_cache true) =======
      1600. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= =======
      1601. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1602. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= =======
      1603. 1 >>>>>>> c033601 (Rebased) >>>>>>> 9a49b7b (Rebased) =======
      1604. 1 >>>>>>> 70fcacc (Featire specs) =======
      1605. >>>>>>> 78717cc (Manifest_cache true) ======= >>>>>>> 98beee2 (Manifest_cache true) ======= =======
      1606. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> ae409ca (Featire specs) ======= =======
      1607. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= =======
      1608. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= =======
      1609. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> bc757df (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= =======
      1610. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 11792758 (Rebased) =======
      1611. >>>>>>> aa3618b (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> 31d15e66 (Fix) =======
      1612. 1 >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 84003439 (Featire specs) =======
      1613. 1 >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      1614. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= =======
      1615. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1616. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1617. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
      1618. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= =======
      1619. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1620. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1621. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= =======
      1622. 1 >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1623. <<<<<<< HEAD
      1624. =======
      1625. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1626. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 610b6138 (Featire specs) =======
      1627. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= =======
      1628. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1629. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      1630. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1631. =======
      1632. 1 >>>>>>> 08edf50 (Featire specs) =======
      1633. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1634. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1635. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1636. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1637. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1638. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1639. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      1640. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1641. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1642. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1643. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1644. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1645. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1646. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1647. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
      1648. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      1649. >>>>>>> 49e8a6c (Rebased) =======
      1650. 1 >>>>>>> 872e675 (Fix) =======
      1651. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      1652. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) options.add_argument('--ignore-certificate-errors=true')
      1653. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1654. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1655. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1656. =======
      1657. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1658. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1659. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1660. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1661. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1662. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1663. ======= <<<<<<< HEAD
      1664. 1 =======
      1665. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1666. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1667. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1668. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1669. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1670. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1671. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1672. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1673. <<<<<<< HEAD
      1674. =======
      1675. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1676. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1677. 1 >>>>>>> 08edf50 (Featire specs) =======
      1678. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1679. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1680. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1681. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1682. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options.add_argument('--accept-insecure-certs=true') >>>>>>> 610b6138 (Featire specs)
      1683. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true)
      1684. =======
      1685. 1 >>>>>>> 08edf50 (Featire specs) =======
      1686. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= =======
      1687. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= =======
      1688. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1689. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1690. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1691. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1692. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
      1693. 1 <<<<<<< HEAD ======= ======= <<<<<<< HEAD
      1694. 1 >>>>>>> 0d6dd12 (Manifest_cache true) =======
      1695. 1 >>>>>>> e3e66f3 (Featire specs) =======
      1696. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
      1697. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1698. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1699. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1700. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
      1701. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
      1702. >>>>>>> 49e8a6c (Rebased) =======
      1703. 1 >>>>>>> 872e675 (Fix) =======
      1704. >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) =======
      1705. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) options.add_argument('--ignore-certificate-errors=true')
      1706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1707. 1 <<<<<<< HEAD <<<<<<< HEAD =======
      1708. 1 <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs)
      1709. =======
      1710. 1 <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      1711. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1712. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1713. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) =======
      1714. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) =======
      1715. >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price)
      1716. ======= <<<<<<< HEAD
      1717. 1 =======
      1718. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
      1719. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1720. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1721. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      1722. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1723. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= =======
      1724. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) =======
      1725. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) options.add_argument('--ignore-certificate-errors=true')
      1726. <<<<<<< HEAD
      1727. =======
      1728. 1 >>>>>>> 4e81ea2 (Featire specs) =======
      1729. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      1730. 1 >>>>>>> 08edf50 (Featire specs) =======
      1731. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1732. 1 >>>>>>> 7a02bbe (Featire specs) =======
      1733. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      1734. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= =======
      1735. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) =======
      1736. 1 >>>>>>> c7a726c5 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) options.add_argument('--accept-insecure-certs=true')
      1737. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1738. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1739. =======
      1740. >>>>>>> 752f0c0 (Featire specs) =======
      1741. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1742. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1743. >>>>>>> aa7b40c (Manifest_cache true) =======
      1744. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) =======
      1745. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1746. =======
      1747. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1748. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1749. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
      1750. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1751. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      1752. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1753. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1754. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      1755. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd30d038 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1756. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1757. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1758. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      1759. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1760. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1761. =======
      1762. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1763. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1764. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1765. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1766. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1767. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      1768. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      1769. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      1770. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1771. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      1772. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1773. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= =======
      1774. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1775. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1776. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      1777. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1778. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1779. =======
      1780. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1781. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1782. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1783. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1784. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1785. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      1786. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      1787. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      1788. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1789. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      1790. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1791. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1792. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= >>>>>>> ef483b6d (Fix) >>>>>>> b28889f (Fix) >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 49df518 (Fix book_spec decrease quantity and price) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> b28889f (Fix) >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a2009f1 (Fix) ======= >>>>>>> fdab719f (Fix) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1793. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> f8e5c9db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      1794. >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs)
      1795. 1 =======
      1796. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> d34a0770 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
      1797. 1 >>>>>>> 752f0c0 (Featire specs) =======
      1798. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) =======
      1799. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs) =======
      1800. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 255dd8d (Manifest_cache true) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1801. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) >>>>>>> 9bfbd88 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs)
      1802. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= =======
      1803. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> d52f9efe (Featire specs)
      1804. =======
      1805. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bb5c652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= =======
      1806. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs)
      1807. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 9a49b7b (Rebased) ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 78717cc (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 98beee2 (Manifest_cache true) ======= ======= >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) =======
      1808. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> ae409ca (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 385b8df (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 379a979 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7bc7f9f (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> adc21e0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 84d0df6 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 37e48018 (Featire specs) >>>>>>> bc757df (Fix book_spec decrease quantity and price) ======= ======= =======
      1809. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4d90e3d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= ======= =======
      1810. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 450f4e3 (Manifest_cache true) ======= ======= =======
      1811. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 34bfcb27 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 11792758 (Rebased) ======= =======
      1812. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa3618b (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> aa3618b (Rebased) >>>>>>> 31d15e66 (Fix) ======= =======
      1813. 1 >>>>>>> a5d032d (Fix) >>>>>>> 160fb15 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 67ab5299 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
      1814. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> 4367ccb1 (Manifest_cache true)
      1815. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
      1816. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= =======
      1817. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      1818. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fdab719f (Fix) ======= >>>>>>> bc6bc8d2 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) >>>>>>> 8288136d (Fix) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> fd3f47ab (Featire specs)
      1819. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8288136d (Fix) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> 5a2009f1 (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 9c626020 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> ae884b47 (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 21793167 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1820. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 74240509 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
      1821. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a1a479e2 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1822. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1823. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= =======
      1824. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 841ee2e4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1825. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      1826. 1 >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 9bfbd88 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 7bc7f9f (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> bc757df (Fix book_spec decrease quantity and price) >>>>>>> a31f8712 (Fix book_spec decrease quantity and price) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 65eb296 (Fix book_spec decrease quantity and price) >>>>>>> 851ad77d (Fix book_spec decrease quantity and price) ======= >>>>>>> aa3618b (Rebased) >>>>>>> 11792758 (Rebased) ======= >>>>>>> 31d15e66 (Fix) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD >>>>>>> c8da2e3 (Fix) <<<<<<< HEAD >>>>>>> fdab719f (Fix) ======= ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2e7011 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 0ffbe39c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) <<<<<<< HEAD >>>>>>> 557c1b8 (Fix) <<<<<<< HEAD >>>>>>> 8288136d (Fix) ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD >>>>>>> bf137e4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 824ea7c9 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1827. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 49df518 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 88af22d1 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
      1828. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 28bae8e (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 04426412 (Fix book_spec decrease quantity and price) ======= ======= ======= =======
      1829. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1830. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= =======
      1831. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8fb0784 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6efa2ba4 (Fix book_spec decrease quantity and price) ======= ======= =======
      1832. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) Capybara::Selenium::Driver.new(
      1833. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 7afa007b (Manifest_cache true) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      1834. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
      1835. =======
      1836. >>>>>>> 4e81ea2 (Featire specs) =======
      1837. >>>>>>> aa7b40c (Manifest_cache true) =======
      1838. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> fc3774fd (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 6da9530 (Featire specs) =======
      1839. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      1840. =======
      1841. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1842. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1843. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
      1844. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1845. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
      1846. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      1847. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1848. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      1849. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      1850. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      1851. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1852. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      1853. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1854. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      1855. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1856. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1857. =======
      1858. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1859. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1860. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1861. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1862. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1863. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1864. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      1865. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      1866. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      1867. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      1868. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      1869. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= ======= >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
      1870. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
      1871. =======
      1872. >>>>>>> 4e81ea2 (Featire specs) =======
      1873. >>>>>>> aa7b40c (Manifest_cache true) =======
      1874. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      1875. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1876. =======
      1877. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 009401d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      1878. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
      1879. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
      1880. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      1881. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
      1882. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) ======= ======= =======
      1883. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1884. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= ======= =======
      1885. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1886. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      1887. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
      1888. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      1889. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      1890. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      1891. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      1892. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      1893. =======
      1894. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1895. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1896. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1897. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1898. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      1899. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
      1900. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      1901. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      1902. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      1903. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      1904. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      1905. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) app,
      1906. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1907. >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
      1908. ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      1909. =======
      1910. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      1911. >>>>>>> 02a399d (Manifest_cache true) =======
      1912. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      1913. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1914. >>>>>>> 4e81ea2 (Featire specs) =======
      1915. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      1916. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      1917. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1918. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true)
      1919. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      1920. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      1921. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= =======
      1922. >>>>>>> 752f0c0 (Featire specs) =======
      1923. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1924. >>>>>>> 4e81ea2 (Featire specs) =======
      1925. >>>>>>> aa7b40c (Manifest_cache true) =======
      1926. >>>>>>> 08edf50 (Featire specs) =======
      1927. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1928. >>>>>>> 7a02bbe (Featire specs) =======
      1929. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      1930. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      1931. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      1932. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD app, ======= browser: :chrome, >>>>>>> c7a726c5 (Rebased)
      1933. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= >>>>>>> 6e923b9d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 9440753 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      1934. ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs)
      1935. =======
      1936. >>>>>>> d0dc1f1 (Featire specs) =======
      1937. >>>>>>> 02a399d (Manifest_cache true) =======
      1938. >>>>>>> 752f0c0 (Featire specs) =======
      1939. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1940. >>>>>>> 4e81ea2 (Featire specs) =======
      1941. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      1942. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      1943. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1944. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
      1945. <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs)
      1946. =======
      1947. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      1948. >>>>>>> 02a399d (Manifest_cache true) =======
      1949. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      1950. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1951. >>>>>>> 4e81ea2 (Featire specs) =======
      1952. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
      1953. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      1954. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1955. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true)
      1956. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      1957. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      1958. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= =======
      1959. >>>>>>> 752f0c0 (Featire specs) =======
      1960. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1961. >>>>>>> 4e81ea2 (Featire specs) =======
      1962. >>>>>>> aa7b40c (Manifest_cache true) =======
      1963. >>>>>>> 08edf50 (Featire specs) =======
      1964. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1965. >>>>>>> 7a02bbe (Featire specs) =======
      1966. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      1967. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      1968. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      1969. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) =======
      1970. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      1971. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD browser: :chrome, ======= http_client: client, >>>>>>> c7a726c5 (Rebased)
      1972. <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs)
      1973. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c51bf93 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9d98d9ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 8cbdfeb (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b7749a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs)
      1974. =======
      1975. >>>>>>> d0dc1f1 (Featire specs) =======
      1976. >>>>>>> 02a399d (Manifest_cache true) =======
      1977. >>>>>>> 752f0c0 (Featire specs) =======
      1978. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1979. >>>>>>> 4e81ea2 (Featire specs) =======
      1980. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      1981. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      1982. >>>>>>> 183b6c5 (Manifest_cache true) =======
      1983. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD
      1984. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
      1985. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
      1986. ======= >>>>>>> 93bdda9 (Featire specs)
      1987. >>>>>>> d0dc1f1 (Featire specs) ======= =======
      1988. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      1989. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      1990. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      1991. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
      1992. =======
      1993. >>>>>>> d0dc1f1 (Featire specs) =======
      1994. >>>>>>> 02a399d (Manifest_cache true) =======
      1995. >>>>>>> 752f0c0 (Featire specs) =======
      1996. >>>>>>> bd8bda4 (Manifest_cache true) =======
      1997. >>>>>>> 4e81ea2 (Featire specs) =======
      1998. >>>>>>> aa7b40c (Manifest_cache true) =======
      1999. >>>>>>> 08edf50 (Featire specs) =======
      2000. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2001. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2002. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2003. >>>>>>> 11792758 (Rebased) ======= ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) >>>>>>> 009401d (Featire specs)
      2004. ======= ======= ======= >>>>>>> 08edf50 (Featire specs) =======
      2005. ======= >>>>>>> 93bdda9 (Featire specs)
      2006. >>>>>>> d0dc1f1 (Featire specs) ======= =======
      2007. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
      2008. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
      2009. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
      2010. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> e3e66f3 (Featire specs)
      2011. =======
      2012. >>>>>>> d0dc1f1 (Featire specs) =======
      2013. >>>>>>> 02a399d (Manifest_cache true) =======
      2014. >>>>>>> 752f0c0 (Featire specs) =======
      2015. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2016. >>>>>>> 4e81ea2 (Featire specs) =======
      2017. >>>>>>> aa7b40c (Manifest_cache true) =======
      2018. >>>>>>> 08edf50 (Featire specs) =======
      2019. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= =======
      2020. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) browser: :chrome,
      2021. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 6da9530 (Featire specs)
      2022. =======
      2023. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD =======
      2024. >>>>>>> 02a399d (Manifest_cache true) =======
      2025. >>>>>>> 752f0c0 (Featire specs) =======
      2026. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2027. >>>>>>> 4e81ea2 (Featire specs) =======
      2028. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6da9530 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 6da9530 (Featire specs) http_client: client, ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD
      2029. >>>>>>> df37394 (Featire specs)
      2030. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      2031. >>>>>>> 02a399d (Manifest_cache true) =======
      2032. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2033. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2034. >>>>>>> 4e81ea2 (Featire specs) =======
      2035. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      2036. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2037. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2038. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2039. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
      2040. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      2041. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= =======
      2042. >>>>>>> 08edf50 (Featire specs) =======
      2043. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      2044. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      2045. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      2046. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2047. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD browser: :chrome,
      2048. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs)
      2049. =======
      2050. >>>>>>> d0dc1f1 (Featire specs) =======
      2051. >>>>>>> 02a399d (Manifest_cache true) =======
      2052. >>>>>>> 752f0c0 (Featire specs) =======
      2053. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2054. >>>>>>> 4e81ea2 (Featire specs) =======
      2055. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD ======= =======
      2056. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2057. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2058. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2059. >>>>>>> 11792758 (Rebased) >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4d4cf6b4 (Featire specs) <<<<<<< HEAD =======
      2060. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased)
      2061. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
      2062. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
      2063. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD
      2064. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      2065. <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      2066. >>>>>>> d0dc1f1 (Featire specs) =======
      2067. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2068. >>>>>>> 752f0c0 (Featire specs) =======
      2069. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2070. >>>>>>> 4e81ea2 (Featire specs) =======
      2071. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2072. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2073. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2074. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) =======
      2075. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
      2076. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2077. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2078. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= =======
      2079. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= =======
      2080. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= =======
      2081. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= =======
      2082. >>>>>>> 08edf50 (Featire specs) =======
      2083. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      2084. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= =======
      2085. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= =======
      2086. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c59d1a99 (Manifest_cache true) ======= ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2087. >>>>>>> df37394 (Featire specs)
      2088. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= <<<<<<< HEAD ======= =======
      2089. >>>>>>> 02a399d (Manifest_cache true) =======
      2090. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= =======
      2091. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2092. >>>>>>> 4e81ea2 (Featire specs) =======
      2093. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= =======
      2094. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2095. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2096. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2097. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs)
      2098. <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      2099. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= =======
      2100. >>>>>>> 08edf50 (Featire specs) =======
      2101. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      2102. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      2103. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      2104. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= ======= >>>>>>> 7c4ea7f (Fix)
      2105. >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) http_client: client, <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 311e9fa (Rebased) ======= >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= http_client: client, <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d8abfed3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= http_client: client, >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2106. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased)
      2107. <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD =======
      2108. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      2109. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD
      2110. >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
      2111. <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) =======
      2112. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2113. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2114. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
      2115. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2116. >>>>>>> 4e81ea2 (Featire specs) =======
      2117. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      2118. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= =======
      2119. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2120. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> e5890c2 (Manifest_cache true) >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 304cd28a (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> 255dd8d (Manifest_cache true) =======
      2121. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= =======
      2122. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2123. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2124. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= =======
      2125. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= =======
      2126. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= =======
      2127. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= =======
      2128. >>>>>>> 08edf50 (Featire specs) =======
      2129. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      2130. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= =======
      2131. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= =======
      2132. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= >>>>>>> 251144b4 (Manifest_cache true) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= ) ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= ======= http_client: client, >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs)
      2133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2134. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> d34a0770 (Manifest_cache true) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs)
      2135. =======
      2136. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs)
      2137. >>>>>>> 02a399d (Manifest_cache true) =======
      2138. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> d4235040 (Manifest_cache true)
      2139. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD
      2140. =======
      2141. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) =======
      2142. >>>>>>> 02a399d (Manifest_cache true) =======
      2143. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= =======
      2144. >>>>>>> 4e81ea2 (Featire specs) =======
      2145. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= =======
      2146. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      2147. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= =======
      2148. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) =======
      2149. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2150. >>>>>>> 7a02bbe (Featire specs) =======
      2151. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2152. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 304cd28a (Manifest_cache true)
      2153. ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      2154. =======
      2155. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      2156. >>>>>>> 02a399d (Manifest_cache true) =======
      2157. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) ======= ======= =======
      2158. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) =======
      2159. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      2160. >>>>>>> 4e81ea2 (Featire specs) =======
      2161. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) ======= ======= =======
      2162. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) ======= ======= =======
      2163. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) ======= ======= =======
      2164. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) ======= ======= =======
      2165. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> bf05825 (Featire specs) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf05825 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> 84809242 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD
      2166. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
      2167. =======
      2168. >>>>>>> d0dc1f1 (Featire specs) =======
      2169. >>>>>>> 02a399d (Manifest_cache true) =======
      2170. >>>>>>> 752f0c0 (Featire specs) =======
      2171. >>>>>>> bd8bda4 (Manifest_cache true) =======
      2172. >>>>>>> 4e81ea2 (Featire specs) =======
      2173. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= =======
      2174. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      2175. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2176. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2177. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      2178. >>>>>>> 75fa7e1b (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
      2179. >>>>>>> 08edf50 (Featire specs) >>>>>>> e3e66f3 (Featire specs) =======
      2180. >>>>>>> 183b6c5 (Manifest_cache true) =======
      2181. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD =======
      2182. >>>>>>> 49e8a6c (Rebased) ======= =======
      2183. >>>>>>> 08edf50 (Featire specs) =======
      2184. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4367ccb1 (Manifest_cache true) ======= =======
      2185. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 8cbdfeb (Manifest_cache true) ======= =======
      2186. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4fac471d (Manifest_cache true) >>>>>>> 36356d3 (Featire specs) ======= =======
      2187. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
      2188. >>>>>>> 5b7749a (Fix) ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= =======
      2189. >>>>>>> 08edf50 (Featire specs) >>>>>>> 610b6138 (Featire specs) ======= =======
      2190. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      2191. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) >>>>>>> 4367ccb1 (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 4fac471d (Manifest_cache true) ======= =======
      2192. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 4f4ea3f9 (Featire specs) ) ======= ======= >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> ebcdce06 (Featire specs) options: options ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
      2193. <<<<<<< HEAD
      2194. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs)
      2195. =======
      2196. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD
      2197. >>>>>>> 02a399d (Manifest_cache true) =======
      2198. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2199. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2200. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      2201. >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2202. >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2203. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2204. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2205. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased) >>>>>>> 13fca83d (Rebased)
      2206. <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2207. >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased)
      2208. <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      2209. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= >>>>>>> 6cdb2e1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true)
      2210. =======
      2211. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs)
      2212. >>>>>>> 02a399d (Manifest_cache true) =======
      2213. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 6cdb2e1 (Featire specs) >>>>>>> b3f2049 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
      2214. <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) )
      2215. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD
      2216. >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2217. >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD
      2218. >>>>>>> d782a28 (Manifest_cache true) >>>>>>> a304bcf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2219. >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> b719333 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
      2220. >>>>>>> 5507b42 (Featire specs) >>>>>>> 932dbec (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) >>>>>>> 311e9fa (Rebased)
      2221. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> e5890c2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 8cbdfeb (Manifest_cache true) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 64dceec (Manifest_cache true) ======= >>>>>>> 5b7749a (Fix)
      2222. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 37e48018 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 64dceec (Manifest_cache true) >>>>>>> 4fac471d (Manifest_cache true)
      2223. =======
      2224. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true)
      2225. >>>>>>> 02a399d (Manifest_cache true) =======
      2226. >>>>>>> 752f0c0 (Featire specs) =======
      2227. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd30d038 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
      2228. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> d4235040 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
      2229. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1d6a89b5 (Manifest_cache true) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 490b01d6 (Manifest_cache true) ======= ======= =======
      2230. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= =======
      2231. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2232. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= >>>>>>> 4367ccb1 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= =======
      2233. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
      2234. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) <<<<<<< HEAD
      2235. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 251144b4 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 610b6138 (Featire specs) ======= =======
      2236. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= =======
      2237. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2238. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= =======
      2239. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2240. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2241. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0341d6de (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> d245196f (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2242. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2243. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 304cd28a (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2244. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
      2245. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= =======
      2246. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= =======
      2247. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> e59c273d (Manifest_cache true) ======= ======= ======= =======
      2248. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= =======
      2249. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7afa007b (Manifest_cache true) ======= ======= =======
      2250. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
      2251. ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> c59d1a99 (Manifest_cache true) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= =======
      2252. >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD >>>>>>> e5890c2 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1d6a89b5 (Manifest_cache true) ======= ======= ======= ======= =======
      2253. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= =======
      2254. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
      2255. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= =======
      2256. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
      2257. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2258. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b719333 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d34a0770 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a304bcf (Manifest_cache true) <<<<<<< HEAD >>>>>>> bd30d038 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= =======
      2259. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) <<<<<<< HEAD >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2260. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> 255dd8d (Manifest_cache true) <<<<<<< HEAD >>>>>>> d4235040 (Manifest_cache true) ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= =======
      2261. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
      2262. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= =======
      2263. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= =======
      2264. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8cbdfeb (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4367ccb1 (Manifest_cache true) ======= ======= ======= =======
      2265. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= =======
      2266. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 64dceec (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4fac471d (Manifest_cache true) ======= ======= =======
      2267. >>>>>>> 7c4ea7f (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= =======
      2268. >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end

      spec/support/configs/shoulda_matcher.rb

      100.0% lines covered

      5 relevant lines. 5 lines covered and 0 lines missed.
          
      1. 1 Shoulda::Matchers.configure do |config|
      2. 1 config.integrate do |with|
      3. 1 with.test_framework :rspec
      4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
      5. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      6. 1 =======
      7. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      8. >>>>>>> 752f0c0 (Featire specs) =======
      9. >>>>>>> 4e81ea2 (Featire specs) =======
      10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 37e48018 (Featire specs) =======
      11. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) =======
      12. 1 >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      17. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= =======
      18. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> ef483b6d (Fix) =======
      19. 1 >>>>>>> 5b7749a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      20. 1 >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 8f42922 (Featire specs) ======= ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      21. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> bf05825 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      22. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      23. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> e3e66f3 (Featire specs) =======
      24. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      25. 1 >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= =======
      26. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) with.library :active_record ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= with.library :active_record ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= with.library :active_record >>>>>>> 75fa7e1b (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Keep as many of these lines as are necessary: >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= with.library :active_record >>>>>>> 5b7749a (Fix) >>>>>>> d9d85ca6 (Fix)
      27. =======
      28. >>>>>>> c7a726c5 (Rebased) 1 ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84809242 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> 393eff3b (Featire specs) with.library :active_record ======= >>>>>>> 610b6138 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= with.library :active_record >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) with.library :active_record ======= <<<<<<< HEAD ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) ======= >>>>>>> 6da9530 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 0d6dd12 (Manifest_cache true) ======= # Keep as many of these lines as are necessary: >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= with.library :active_record >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= with.library :active_record >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      29. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 36356d3 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) with.library :active_record
      30. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 610b6138 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) ======= >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> d8dd3b4a (Featire specs) ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> 36356d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 610b6138 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 11792758 (Rebased) ======= ======= >>>>>>> 9d98d9ab (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 009401d (Featire specs) <<<<<<< HEAD >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) with.library :active_model
      31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
      32. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      33. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      34. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      35. =======
      36. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      37. >>>>>>> 752f0c0 (Featire specs) =======
      38. >>>>>>> 4e81ea2 (Featire specs) =======
      39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      40. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      41. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
      42. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      43. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      44. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      45. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      46. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      47. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      48. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      49. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      50. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      52. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      53. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      54. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      55. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      56. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      57. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      58. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      59. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      60. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      61. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      62. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      63. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      64. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      65. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      66. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      67. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      68. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8dd3b4a (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> 365d41ed (Featire specs) ======= ======= >>>>>>> fc3774fd (Featire specs) ======= >>>>>>> d8abfed3 (Featire specs) ======= >>>>>>> 13fca83d (Rebased) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) ======= >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= >>>>>>> ef483b6d (Fix) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> 4bf888bf (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) >>>>>>> f8e5c9db (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) >>>>>>> efd6af09 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) >>>>>>> d52f9efe (Featire specs) ======= ======= >>>>>>> af057e3 (Featire specs) >>>>>>> ae07231a (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c12b71de (Featire specs)
      70. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      71. ======= <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) =======
      72. ======= <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= ======= >>>>>>> 36356d3 (Featire specs) >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)
      73. =======
      74. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
      75. >>>>>>> 752f0c0 (Featire specs) =======
      76. >>>>>>> 4e81ea2 (Featire specs) =======
      77. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= =======
      78. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 34509eee (Featire specs) =======
      79. >>>>>>> 75fa7e1b (Rebased) ======= ======= >>>>>>> f8e5c9db (Featire specs) ======= >>>>>>> efd6af09 (Featire specs) ======= >>>>>>> d52f9efe (Featire specs) ======= >>>>>>> ae07231a (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) >>>>>>> 824bb2b (Featire specs) >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> 365d41ed (Featire specs) ======= >>>>>>> c05ee511 (Featire specs) ======= >>>>>>> f136376a (Featire specs) ======= >>>>>>> 1ca9c0ea (Featire specs) ======= >>>>>>> 89d7dcd2 (Manifest_cache true) ======= >>>>>>> f0e2e12a (Featire specs) >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 9d98d9ab (Featire specs) ======= =======
      80. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 009401d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d8dd3b4a (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      81. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> 365d41ed (Featire specs) ======= ======= ======= =======
      82. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> c05ee511 (Featire specs) ======= ======= ======= =======
      83. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      84. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      85. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= =======
      86. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= =======
      87. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> f136376a (Featire specs) ======= ======= ======= =======
      88. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> 1ca9c0ea (Featire specs) ======= ======= =======
      89. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= =======
      90. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      91. >>>>>>> 4552227 (Featire specs) >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= =======
      92. >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) =======
      93. >>>>>>> c7a726c5 (Rebased) ======= >>>>>>> 610b6138 (Featire specs) ======= =======
      94. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 37e48018 (Featire specs) =======
      95. >>>>>>> 11792758 (Rebased) ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 9d98d9ab (Featire specs) ======= ======= ======= >>>>>>> 6cdb2e1 (Featire specs) ======= >>>>>>> 932dbec (Featire specs) ======= >>>>>>> 77d62af (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) =======
      96. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD >>>>>>> 8f42922 (Featire specs) <<<<<<< HEAD >>>>>>> f8e5c9db (Featire specs) ======= ======= ======= =======
      97. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD >>>>>>> 6cdb2e1 (Featire specs) <<<<<<< HEAD >>>>>>> efd6af09 (Featire specs) ======= ======= ======= =======
      98. >>>>>>> 0d6dd12 (Manifest_cache true) =======
      99. >>>>>>> e3e66f3 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
      100. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= =======
      101. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= =======
      102. >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> 932dbec (Featire specs) <<<<<<< HEAD >>>>>>> d52f9efe (Featire specs) ======= ======= ======= =======
      103. >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD >>>>>>> 77d62af (Featire specs) <<<<<<< HEAD >>>>>>> ae07231a (Featire specs) ======= ======= =======
      104. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= =======
      105. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= =======
      106. >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) end
      <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 824bb2b (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f506ffd0 (Manifest_cache true) ======= >>>>>>> c12b71de (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bc6bc8d2 (Rebased) ======= >>>>>>> f506ffd0 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c12b71de (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> 0d6dd12 (Manifest_cache true) >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 824bb2b (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed32b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b904d7ae (Featire specs) >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 824bb2b (Featire specs) >>>>>>> 84003439 (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> ed32b84 (Featire specs) >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> b904d7ae (Featire specs) ======= ======= >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4d4cf6b4 (Featire specs) ======= >>>>>>> f7852d17 (Manifest_cache true) ======= >>>>>>> fd3f47ab (Featire specs) ======= >>>>>>> 0f8241bb (Featire specs) ======= >>>>>>> 9440753 (Featire specs) ======= >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58c2c0f1 (Featire specs) ======= ======= >>>>>>> 4f4ea3f9 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> 9440753 (Featire specs) >>>>>>> 6b6d1c2d (Featire specs) ======= >>>>>>> 4d4cf6b4 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 6e923b9d (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 34509eee (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 75fa7e1b (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84809242 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 4f4ea3f9 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 7a08014b (Featire specs) ======= >>>>>>> 6b6d1c2d (Featire specs) ======= ======= >>>>>>> e3e66f3 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> 0d6dd12 (Manifest_cache true) ======= >>>>>>> e3e66f3 (Featire specs) ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> b904d7ae (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> fc3774fd (Featire specs) ======= ======= ======= ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> d8abfed3 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> 13fca83d (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9afd7e66 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> 4bf888bf (Featire specs) ======= ======= >>>>>>> a45f1ec (Add login registration pages) <<<<<<< HEAD >>>>>>> 3b954593 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> add330c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 89d7dcd2 (Manifest_cache true) ======= ======= >>>>>>> 5a7e688 (Add User and Review Decorators and Show Review) <<<<<<< HEAD >>>>>>> 4bf50361 (Add User and Review Decorators and Show Review) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> f0e2e12a (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> 393eff3b (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 5b7749a (Fix) <<<<<<< HEAD >>>>>>> d9d85ca6 (Fix) ======= >>>>>>> c7a726c5 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> ebcdce06 (Featire specs) ======= >>>>>>> 610b6138 (Featire specs) ======= >>>>>>> 37e48018 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 11792758 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 824bb2b (Featire specs) <<<<<<< HEAD >>>>>>> 84003439 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) >>>>>>> c51bf93 (Featire specs) <<<<<<< HEAD >>>>>>> 7a08014b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) <<<<<<< HEAD >>>>>>> 9440753 (Featire specs) <<<<<<< HEAD >>>>>>> 6b6d1c2d (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) <<<<<<< HEAD >>>>>>> ed32b84 (Featire specs) <<<<<<< HEAD >>>>>>> 4d4cf6b4 (Featire specs) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD >>>>>>> 311e9fa (Rebased) <<<<<<< HEAD >>>>>>> bc6bc8d2 (Rebased) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1622d61 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f506ffd0 (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> e3e66f3 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) >>>>>>> bf05825 (Featire specs) <<<<<<< HEAD >>>>>>> c12b71de (Featire specs) ======= ======= >>>>>>> a45f1ec (Add login registration pages) <<<<<<< HEAD >>>>>>> b3f4cb6c (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> add330c (Manifest_cache true) >>>>>>> 0d6dd12 (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7852d17 (Manifest_cache true) ======= ======= >>>>>>> 5a7e688 (Add User and Review Decorators and Show Review) <<<<<<< HEAD >>>>>>> 835651a9 (Add User and Review Decorators and Show Review) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) <<<<<<< HEAD >>>>>>> e3e66f3 (Featire specs) <<<<<<< HEAD >>>>>>> fd3f47ab (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) <<<<<<< HEAD >>>>>>> 36356d3 (Featire specs) <<<<<<< HEAD >>>>>>> b904d7ae (Featire specs) ======= ======= ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) >>>>>>> 5b7749a (Fix) >>>>>>> ef483b6d (Fix) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> 6da9530 (Featire specs) >>>>>>> 0f8241bb (Featire specs)